diff --git a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
index f440a3c928e5c5a67140260b7fbd78ed6ab3cf7c..716d0413abc0ed4897c5825f7471946ea7d28aa3 100644
--- a/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
+++ b/src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py
@@ -22,12 +22,12 @@ def setup_config_rules(
 ) -> List[Dict]:
 
     if service_settings  is None: return []
+    if device_settings   is None: return []
     if endpoint_settings is None: return []
-    if device_settings is None: return []
 
     json_settings          : Dict = service_settings.value
-    json_endpoint_settings : Dict = endpoint_settings.value
     json_device_settings   : Dict = device_settings.value
+    json_endpoint_settings : Dict = endpoint_settings.value
 
     mtu                       = json_settings.get('mtu',                          1450     )  # 1512
     #address_families         = json_settings.get('address_families',             []       )  # ['IPV4']
@@ -199,12 +199,12 @@ def teardown_config_rules(
 ) -> List[Dict]:
 
     if service_settings  is None: return []
-    if endpoint_settings is None: return []
     if device_settings is None: return []
+    if endpoint_settings is None: return []
 
     json_settings          : Dict = service_settings.value
-    json_endpoint_settings : Dict = endpoint_settings.value
     json_device_settings   : Dict = device_settings.value
+    json_endpoint_settings : Dict = endpoint_settings.value
 
     service_short_uuid        = service_uuid.split('-')[-1]
     network_instance_name     = '{:s}-NetInst'.format(service_short_uuid)