Index: uspace/srv/net/nil/nildummy/nildummy_module.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 09d5ec86079b335f42b9c4f89021753f52db7afd)
+++ uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 4ef32e0c2a2647fd06ca517bb1fac066d2d77125)
@@ -38,5 +38,5 @@
 #include <async.h>
 #include <stdio.h>
-#include <err.h>
+#include <errno.h>
 
 #include <ipc/ipc.h>
@@ -52,15 +52,25 @@
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
-	ERROR_DECLARE;
+	ipcarg_t phonehash;
+	int rc;
 	
 	async_set_client_connection(client_connection);
 	int net_phone = net_connect_module();
-	ERROR_PROPAGATE(pm_init());
 	
-	ipcarg_t phonehash;
-	if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
-	    ERROR_OCCURRED(REGISTER_ME(SERVICE_NILDUMMY, &phonehash))) {
+	rc = pm_init();
+	if (rc != EOK)
+		return rc;
+	
+	
+	rc = nil_initialize(net_phone);
+	if (rc != EOK) {
 		pm_destroy();
-		return ERROR_CODE;
+		return rc;
+	}
+	
+	rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
+	if (rc != EOK) {
+		pm_destroy();
+		return rc;
 	}