diff --git a/src/main/java/net/onrc/onos/apps/segmentrouting/IcmpHandler.java b/src/main/java/net/onrc/onos/apps/segmentrouting/IcmpHandler.java
index e32d7c1..675a492 100644
--- a/src/main/java/net/onrc/onos/apps/segmentrouting/IcmpHandler.java
+++ b/src/main/java/net/onrc/onos/apps/segmentrouting/IcmpHandler.java
@@ -446,6 +446,11 @@
         String gwIpSrc = getGwIpForSubnet(ipv4.getSourceAddress());
         String gwIpDest = getGwIpForSubnet(ipv4.getDestinationAddress());
 
+        if (gwIpSrc == null || gwIpDest == null) {
+            log.warn("Failed to get gateway IP for {}", ipv4);
+            return false;
+        }
+
         if (gwIpSrc.equals(gwIpDest)) {
             return true;
         }