diff --git a/scripts/pi-hole/js/network.js b/scripts/pi-hole/js/network.js
index a851ea2e..a6c90f6d 100644
--- a/scripts/pi-hole/js/network.js
+++ b/scripts/pi-hole/js/network.js
@@ -105,7 +105,7 @@ $(document).ready(function() {
              }
 
              // Set hostname to "N/A" if not available
-             if(data["name"].length < 1)
+             if(data["name"] && data["name"].length < 1)
              {
                  $("td:eq(3)", row).html("N/A");
              }
@@ -121,7 +121,7 @@ $(document).ready(function() {
               function () { this.style.color=""; } );
 
             // MAC + Vendor field if available
-            if(data["macVendor"].length > 0)
+            if(data["macVendor"] && data["macVendor"].length > 0)
             {
                  $("td:eq(1)", row).html(data["hwaddr"]+"<br/>"+data["macVendor"]);
             }