Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 116d3f6f655456c410fc698142213ee6eceee904)
+++ uspace/srv/vfs/vfs.c	(revision 1c38445b072e92a4871da55c491b0ae443654922)
@@ -94,4 +94,5 @@
 		case VFS_REGISTER:
 			vfs_register(callid, &call);
+			keep_on_going = false;
 			break;
 		case VFS_MOUNT:
Index: uspace/srv/vfs/vfs_mount.c
===================================================================
--- uspace/srv/vfs/vfs_mount.c	(revision 116d3f6f655456c410fc698142213ee6eceee904)
+++ uspace/srv/vfs/vfs_mount.c	(revision 1c38445b072e92a4871da55c491b0ae443654922)
@@ -218,10 +218,10 @@
 	vfs_release_phone(phone);
 
-	if ((rc1 == EOK) && (rc2 == EOK))
-		ipc_answer_fast(rid, EOK, 0, 0);
-	else if (rc1 != EOK)
+	if (rc2 == EOK)
 		ipc_answer_fast(rid, rc1, 0, 0);
+	else if (rc1 == EOK)
+		ipc_answer_fast(rid, rc2, 0, 0);
 	else
-		ipc_answer_fast(rid, rc2, 0, 0);
+		ipc_answer_fast(rid, rc1, 0, 0);
 }
 
