diff --git a/core/src/com/cloud/vm/VirtualMachineName.java b/core/src/com/cloud/vm/VirtualMachineName.java
index e1a1eabf56f..76823e94c7d 100755
--- a/core/src/com/cloud/vm/VirtualMachineName.java
+++ b/core/src/com/cloud/vm/VirtualMachineName.java
@@ -127,7 +127,7 @@ public class VirtualMachineName {
     
     public static boolean isValidRouterName(String name, String instance) {
         String[] tokens = name.split(SEPARATOR);
-        if (tokens.length != 3) {
+        if (tokens.length != 3 && tokens.length != 4 ) {
             return false;
         }
         
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 92f334731f9..e4d4844a54f 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1359,6 +1359,7 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
                 Long id = vmGuru.convertToId(name);
                 if (id != null) {
                     map.put(id, new AgentVmInfo(entry.getKey(), vmGuru, null, entry.getValue()));
+                    break;
                 }
             }
         }