diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 2c030be9b7a..afe99480041 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -705,7 +705,11 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             cmd.addVmData("metadata", "public-hostname",  StringUtils.unicodeEscape(vmName));
         }else
         {
-            cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
+        	if (router.getPublicIpAddress() == null) {
+        		 cmd.addVmData("metadata", "public-ipv4", guestIpAddress);
+        	} else {
+        		cmd.addVmData("metadata", "public-ipv4", router.getPublicIpAddress());
+        	}
             cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress());
         }
         cmd.addVmData("metadata", "instance-id", vmInstanceName);