diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 152f898d174..822f99c0d9b 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -318,11 +318,19 @@ Image *BKE_add_image_file(const char *name)
 	const char *libname;
 	char str[FILE_MAX], strtest[FILE_MAX];
 	
+	/* escape when name is directory */
+	len= strlen(name);
+	if(len) {
+		if(name[len-1]=='/' || name[len-1]=='\\')
+			return NULL;
+	}
+	
 	BLI_strncpy(str, name, sizeof(str));
 	BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
 	
+	/* exists? */
 	file= open(str, O_BINARY|O_RDONLY);
-	if(file== -1) return 0;
+	if(file== -1) return NULL;
 	close(file);
 	
 	/* first search an identical image */