diff --git a/src/device/service/Tools.py b/src/device/service/Tools.py
index 05610e1d2c2522bc167d43c7d0803f00e2472c9b..17edcfaf9fc9cb2ac4c1d491201e84b7da43cacb 100644
--- a/src/device/service/Tools.py
+++ b/src/device/service/Tools.py
@@ -83,6 +83,7 @@ def populate_endpoints(device : Device, driver : _Driver, monitoring_loops : Mon
     results_getconfig = driver.GetConfig(resources_to_get)
 
     errors : List[str] = list()
+    LOGGER.warning(results_getconfig)
     for endpoint in results_getconfig:
         if len(endpoint) != 2:
             errors.append(ERROR_BAD_ENDPOINT.format(device_uuid, str(endpoint)))
@@ -92,6 +93,8 @@ def populate_endpoints(device : Device, driver : _Driver, monitoring_loops : Mon
         if isinstance(resource_value, Exception):
             errors.append(ERROR_GET.format(device_uuid, str(resource_key), str(resource_value)))
             continue
+        if resource_value is None:
+            continue
 
         endpoint_uuid = resource_value.get('uuid')