diff --git a/src/config/schema-transformer/config_db.py b/src/config/schema-transformer/config_db.py
index b3714a91dfa..2dad0dd1500 100644
--- a/src/config/schema-transformer/config_db.py
+++ b/src/config/schema-transformer/config_db.py
@@ -102,7 +102,7 @@ def reinit(cls):
     @classmethod
     def locate(cls, key, *args):
         obj = super(DBBaseST, cls).locate(key, *args)
-        if obj.obj.uuid not in cls._uuid_fq_name_map:
+        if obj and obj.obj.uuid not in cls._uuid_fq_name_map:
             cls._uuid_fq_name_map[obj.obj.uuid] = key
         return obj
     # end locate
@@ -370,7 +370,7 @@ def delete_inactive_service_chains(self, old_scs, new_scs=None):
 
         # Delete the service chains that are no longer active
         for remote_vn_name in old_scs:
-            # Get the Remote VNs in this VN's service chain and 
+            # Get the Remote VNs in this VN's service chain and
             # get a list of the remote service chains in the remote
             # VNs which has this VNs name.
             remote_vn = VirtualNetworkST.get(remote_vn_name)