diff --git a/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java b/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
index 917bd6c..3c92404 100644
--- a/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
+++ b/src/main/java/org/onosproject/cordvtn/CordVtnArpProxy.java
@@ -123,8 +123,6 @@
      * @param gatewayMac gateway mac address
      */
     public void processArpPacket(PacketContext context, Ethernet ethPacket, MacAddress gatewayMac) {
-        checkArgument(!gatewayMac.equals(MacAddress.NONE));
-
         ARP arpPacket = (ARP) ethPacket.getPayload();
         Ip4Address targetIp = Ip4Address.valueOf(arpPacket.getTargetProtocolAddress());
 
@@ -132,6 +130,12 @@
            return;
         }
 
+        if (gatewayMac.equals(MacAddress.NONE)) {
+            log.debug("Gateway mac address is not set, ignoring ARP request");
+            context.block();
+            return;
+        }
+
         Ethernet ethReply = ARP.buildArpReply(
                 targetIp,
                 gatewayMac,