Index: uspace/srv/vfs/vfs.c
===================================================================
--- uspace/srv/vfs/vfs.c	(revision 5b5d25f252b73fa4ce4c6c4adcc81962ee05905e)
+++ uspace/srv/vfs/vfs.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
@@ -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 5b5d25f252b73fa4ce4c6c4adcc81962ee05905e)
+++ uspace/srv/vfs/vfs_mount.c	(revision 75dd55d7399a17f1fe7b170fd0d79e0eed7158c2)
@@ -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);
 }
 
