Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/network/geneve/api.py
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/network/geneve/api.py	(revision 39315)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/models/network/geneve/api.py	(working copy)
@@ -435,7 +435,8 @@
             self.cli.set_config()
             gtep_ip = ""
             direction = FORWARDING_DIRECTION.LOCAL_TYPE
-            if INPUT_FIELD.GTEP_IP in data and data[INPUT_FIELD.GTEP_IP]:
+            if INPUT_FIELD.GTEP_IP in data and data[INPUT_FIELD.GTEP_IP] \
+                and get_ip_by_field(data, INPUT_FIELD.GTEP_IP):
                 gtep_ip = " " + get_ip_by_field(data, INPUT_FIELD.GTEP_IP)
                 direction = FORWARDING_DIRECTION.REMOTE_TYPE
             result = self.cli.cmd('geneve forwarding {dir} {vni} {mac}{ip}'.format(dir=direction,