diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 63c51cdc8a0..01220d375ca 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -567,7 +567,8 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
         String username = cmd.getUsername();
         String password = cmd.getPassword();
 
-        url = URLDecoder.decode(url);
+        if(url != null)
+        	url = URLDecoder.decode(url);
 
         URI uri = null;