diff --git a/src/interdomain/service/RemoteDomainClients.py b/src/interdomain/service/RemoteDomainClients.py
index e28176ef4fad2d3f2e2c6b1d7f0eb8d24116308a..d60450a18287cf8297bd1a6d5bac03fbcccab408 100644
--- a/src/interdomain/service/RemoteDomainClients.py
+++ b/src/interdomain/service/RemoteDomainClients.py
@@ -69,6 +69,7 @@ class RemoteDomainClients(threading.Thread):
             if not isinstance(event, DeviceEvent): continue
             LOGGER.info('Processing Event({:s})...'.format(grpc_message_to_json_string(event)))
             domain_data = get_domain_data(self.context_client, event)
+            if domain_data is None: continue
             domain_name, domain_address, domain_port = domain_data
             try:
                 self.add_peer(domain_name, domain_address, domain_port)
diff --git a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
index 20b186f307fb583734f8d0e96cea2a26e24e5590..40b40ac6604e044af1067308fce2ed0c64d30d44 100644
--- a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
+++ b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
@@ -295,4 +295,4 @@ class TopologyAbstractor(threading.Thread):
             LOGGER.warning('Unsupported Event({:s})'.format(grpc_message_to_json_string(event)))
 
         dlt_record_sender.commit()
-        dlt_connector_client.close()
+        if dlt_connector_client is not None: dlt_connector_client.close()