diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 5e0529eaf5b..5acad897ef4 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1972,9 +1972,8 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
       
         ArrayList<PublicIp> publicIps = providerToIpList.get(provider);
       
-        s_logger.debug("Found " + publicIps.size() + " ip(s) to apply as a part of domR " + router + " start.");
-      
-        if (!publicIps.isEmpty()) {
+        if (publicIps != null && !publicIps.isEmpty()) {
+            s_logger.debug("Found " + publicIps.size() + " ip(s) to apply as a part of domR " + router + " start.");
             List<RemoteAccessVpn> vpns = new ArrayList<RemoteAccessVpn>();
             List<PortForwardingRule> pfRules = new ArrayList<PortForwardingRule>();
             List<FirewallRule> staticNatFirewallRules = new ArrayList<FirewallRule>();
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 0f62037595d..d18ceffe748 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -778,7 +778,11 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
                     IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, guestNic.getIp4Address(), true, false, 
                             true, guestNic.getBroadcastUri().getHost(), guestNic.getGateway(), guestNic.getNetmask(), guestNic.getMacAddress(),
                             null, networkRate, false);
+                    Network network = _networkMgr.getNetwork(guestNic.getNetworkId());
+                    ip.setTrafficType(network.getTrafficType());
                     SetSourceNatCommand cmd = new SetSourceNatCommand(ip, true);
+                    cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId()));
+                    cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, router.getInstanceName());
                     cmds.addCommand(cmd);
                 } 
             }