diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index 18ba1bac0..e11384c5c 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -140,10 +140,13 @@ load_wifi_devices (CcWifiPanel *self)
 
   devices = nm_client_get_devices (self->client);
 
-  /* Cold-plug existing devices */
-  for (i = 0; i < devices->len; i++)
-    add_wifi_device (self, g_ptr_array_index (devices, i));
-
+  if (devices != NULL)
+  {
+    /* Cold-plug existing devices */
+    for (i = 0; i < devices->len; i++)
+      add_wifi_device (self, g_ptr_array_index (devices, i));
+  }
+  
   check_main_stack_page (self);
 }