diff --git a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
index a54300f4..41ed9b1a 100644
--- a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
+++ b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
@@ -331,7 +331,13 @@ public class RoutingDatastoreInMemory extends BaseInMemoryDatastore implements R
 		});
 
 		List<EquipmentGatewayRecord> ret = new ArrayList<>();
-		gwIds.forEach(id -> ret.add(idToGatewayMap.get(id).clone()));
+		
+		gwIds.forEach(id -> {
+			EquipmentGatewayRecord gw = idToGatewayMap.get(id);
+			if(gw!=null) {
+				ret.add(gw.clone());
+			}
+		});
 		
 		return ret;
 	}