diff --git a/sys/net/crosslayer/ng_netif/hdr/ng_netif_hdr_print.c b/sys/net/crosslayer/ng_netif/hdr/ng_netif_hdr_print.c
index 0c7bd3b71b671507b157280a54c465ae6cc0d935..9f1386269ba08fd8a383a600578e9da436607db3 100644
--- a/sys/net/crosslayer/ng_netif/hdr/ng_netif_hdr_print.c
+++ b/sys/net/crosslayer/ng_netif/hdr/ng_netif_hdr_print.c
@@ -24,14 +24,26 @@ void ng_netif_hdr_print(ng_netif_hdr_t *hdr)
     printf("if_pid: %" PRIkernel_pid "  ", hdr->if_pid);
     printf("rssi: %" PRIu8 "  ", hdr->rssi);
     printf("lqi: %" PRIu8 "\n", hdr->lqi);
-    printf("src_l2addr: %s\n",
-           ng_netif_addr_to_str(addr_str, sizeof(addr_str),
-                                ng_netif_hdr_get_src_addr(hdr),
-                                (size_t)hdr->src_l2addr_len));
-    printf("dst_l2addr: %s\n",
-           ng_netif_addr_to_str(addr_str, sizeof(addr_str),
-                                ng_netif_hdr_get_dst_addr(hdr),
-                                (size_t)hdr->dst_l2addr_len));
+
+    if (hdr->src_l2addr_len > 0) {
+        printf("src_l2addr: %s\n",
+               ng_netif_addr_to_str(addr_str, sizeof(addr_str),
+                                    ng_netif_hdr_get_src_addr(hdr),
+                                    (size_t)hdr->src_l2addr_len));
+    }
+    else {
+        puts("src_l2addr: (nil)");
+    }
+
+    if (hdr->dst_l2addr_len > 0) {
+        printf("dst_l2addr: %s\n",
+               ng_netif_addr_to_str(addr_str, sizeof(addr_str),
+                                    ng_netif_hdr_get_dst_addr(hdr),
+                                    (size_t)hdr->dst_l2addr_len));
+    }
+    else {
+        puts("dst_l2addr: (nil)");
+    }
 }
 
 /** @} */