Index: uspace/srv/net/il/arp/arp_module.c
===================================================================
--- uspace/srv/net/il/arp/arp_module.c	(revision 02314f8abb5a1bda938d1dbd628a0f235d680055)
+++ uspace/srv/net/il/arp/arp_module.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
@@ -77,19 +77,16 @@
 	
 	rc = arp_initialize(client_connection);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 	
 	rc = REGISTER_ME(SERVICE_ARP, &phonehash);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 	
 	async_manager();
-	
+
+out:
 	pm_destroy();
-	return EOK;
+	return rc;
 }
 
Index: uspace/srv/net/nil/eth/eth_module.c
===================================================================
--- uspace/srv/net/nil/eth/eth_module.c	(revision 02314f8abb5a1bda938d1dbd628a0f235d680055)
+++ uspace/srv/net/nil/eth/eth_module.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
@@ -63,19 +63,16 @@
 	
 	rc = nil_initialize(net_phone);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 
 	rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 	
 	async_manager();
-	
+
+out:
 	pm_destroy();
-	return EOK;
+	return rc;
 }
 
Index: uspace/srv/net/nil/nildummy/nildummy_module.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 02314f8abb5a1bda938d1dbd628a0f235d680055)
+++ uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 08e3ca40338868956c14486807abfbfd6f4567e3)
@@ -64,19 +64,16 @@
 	
 	rc = nil_initialize(net_phone);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 	
 	rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
-	if (rc != EOK) {
-		pm_destroy();
-		return rc;
-	}
+	if (rc != EOK)
+		goto out;
 	
 	async_manager();
-	
+
+out:
 	pm_destroy();
-	return EOK;
+	return rc;
 }