diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
index efc1a036..cfa61626 100644
--- a/src/lowntfs-3g.c
+++ b/src/lowntfs-3g.c
@@ -4368,9 +4368,12 @@ static int ntfs_open(const char *device)
 	}
         
 	errno = 0;
+	goto out;
 err_out:
+	if (!errno)	/* Make sure to return an error */
+		errno = EIO;
+out :
 	return ntfs_volume_error(errno);
-        
 }
 
 static void usage(void)
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
index fffe5f38..1f148ba0 100644
--- a/src/ntfs-3g.c
+++ b/src/ntfs-3g.c
@@ -4076,9 +4076,12 @@ static int ntfs_open(const char *device)
 	}
 	
 	errno = 0;
+	goto out;
 err_out:
+	if (!errno)
+		errno = EIO;
+out :
 	return ntfs_volume_error(errno);
-	
 }
 
 static void usage(void)