diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index eca5ac400..2eb0b4b5c 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-02  Pavel Tsekov  <ptsekov@gmx.net>
+
+	* fish.c (fish_dir_load): Check the exit status of the remote command
+	and fail with EACCES if it was unsuccessful.
+	Fix the value returned on error - must be -1 instead of 1.
+
 2007-11-02  Vladimir Nadvornik  <nadvornik@suse.cz>
 
 	* smbfs.c (smbfs_convert_path): Replaced NULL with (char *) NULL.
diff --git a/vfs/fish.c b/vfs/fish.c
index 9cc0fb133..2a2deb64c 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -356,6 +356,7 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
     struct vfs_s_entry *ent = NULL;
     FILE *logfile;
     char *quoted_path;
+    int reply_code;
 
     logfile = MEDATA->logfile;
 
@@ -366,6 +367,8 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
     quoted_path = name_quote (remote_path, 0);
     fish_command (me, super, NONE,
 	    "#LIST /%s\n"
+	    "if ls -1 /%s >/dev/null 2>&1 ;\n"
+	    "then\n"
 	    "ls -lLan /%s 2>/dev/null | grep '^[^cbt]' | (\n"
 	      "while read p l u g s m d y n; do\n"
 	        "echo \"P$p $u.$g\nS$s\nd$m $d $y\n:$n\n\"\n"
@@ -376,8 +379,11 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
 	        "echo \"P$p $u.$g\nE$a$i\nd$m $d $y\n:$n\n\"\n"
 	      "done\n"
 	    ")\n"
-	    "echo '### 200'\n",
-	    remote_path, quoted_path, quoted_path);
+	    "echo '### 200'\n"
+	    "else\n"
+	    "echo '### 500'\n"
+	    "fi\n",
+	    remote_path, quoted_path, quoted_path, quoted_path);
     g_free (quoted_path);
     ent = vfs_s_generate_entry(me, NULL, dir, 0);
     while (1) {
@@ -456,17 +462,21 @@ fish_dir_load(struct vfs_class *me, struct vfs_s_inode *dir, char *remote_path)
     }
     
     vfs_s_free_entry (me, ent);
-    me->verrno = E_REMOTE;
-    if (fish_decode_reply(buffer+4, 0) == COMPLETE) {
+    reply_code = fish_decode_reply(buffer + 4, 0);
+    if (reply_code == COMPLETE) {
 	g_free (SUP.cwdir);
 	SUP.cwdir = g_strdup (remote_path);
 	print_vfs_message (_("%s: done."), me->name);
 	return 0;
+    } else if (reply_code == ERROR) {
+	me->verrno = EACCES;
+    } else {
+	me->verrno = E_REMOTE;
     }
 
 error:
     print_vfs_message (_("%s: failure"), me->name);
-    return 1;
+    return -1;
 }
 
 static int