Index: uspace/srv/loader/main.c
===================================================================
--- uspace/srv/loader/main.c	(revision 907bb492e6b79b87fceb2fb84e09b4834b52e273)
+++ uspace/srv/loader/main.c	(revision b014e9f8dfc796df22c985c021ea0869071a9d5a)
@@ -179,5 +179,4 @@
 	
 	ipc_data_write_finalize(callid, arg_buf, buf_len);
-	ipc_answer_0(rid, EOK);
 	
 	arg_buf[buf_len] = '\0';
@@ -199,9 +198,8 @@
 	if (argv == NULL) {
 		free(arg_buf);
-		ipc_answer_0(callid, ENOMEM);
 		ipc_answer_0(rid, ENOMEM);
 		return;
 	}
-	
+
 	/*
 	 * Fill argv with argument pointers
@@ -219,4 +217,6 @@
 	argc = n;
 	argv[n] = NULL;
+
+	ipc_answer_0(rid, EOK);
 }