Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision b4458033b291d1f25ef9d01e533d76655875b4d6)
+++ uspace/srv/net/netif/lo/lo.c	(revision 2e236901d120dfb14e2e8d62ab6f6576d3247f28)
@@ -37,5 +37,4 @@
 #include <async.h>
 #include <errno.h>
-#include <err.h>
 #include <stdio.h>
 #include <str.h>
@@ -83,11 +82,12 @@
 int netif_get_device_stats(device_id_t device_id, device_stats_ref stats)
 {
-	ERROR_DECLARE;
-
 	netif_device_t *device;
+	int rc;
 
 	if (!stats)
 		return EBADMEM;
-	ERROR_PROPAGATE(find_device(device_id, &device));
+	rc = find_device(device_id, &device);
+	if (rc != EOK)
+		return rc;
 	memcpy(stats, (device_stats_ref) device->specific,
 	    sizeof(device_stats_t));
@@ -164,10 +164,11 @@
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io)
 {
-	ERROR_DECLARE;
-
 	netif_device_t *device;
+	int rc;
 
 	// create a new device
-	ERROR_PROPAGATE(create(device_id, &device));
+	rc = create(device_id, &device);
+	if (rc != EOK)
+		return rc;
 	// print the settings
 	printf("%s: Device created (id: %d)\n", NAME, device->device_id);
@@ -177,12 +178,13 @@
 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender)
 {
-	ERROR_DECLARE;
-
 	netif_device_t *device;
 	size_t length;
 	packet_t next;
 	int phone;
-
-	ERROR_PROPAGATE(find_device(device_id, &device));
+	int rc;
+
+	rc = find_device(device_id, &device);
+	if (rc != EOK)
+		return EOK;
 	if (device->state != NETIF_ACTIVE) {
 		netif_pq_release(packet_get_id(packet));
@@ -259,9 +261,9 @@
 int main(int argc, char *argv[])
 {
-	ERROR_DECLARE;
+	int rc;
 	
 	/* Start the module */
-	ERROR_PROPAGATE(netif_module_start(netif_client_connection));
-	return EOK;
+	rc = netif_module_start(netif_client_connection);
+	return rc;
 }