diff --git a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java
index 22f8294fbec..1d9aa7fe944 100644
--- a/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java
+++ b/console-proxy/src/com/cloud/consoleproxy/ConsoleProxyAjaxHandler.java
@@ -185,10 +185,16 @@ public class ConsoleProxyAjaxHandler implements HttpHandler {
 	public static Map<String, String> getQueryMap(String query) {
 		String[] params = query.split("&");
 		Map<String, String> map = new HashMap<String, String>();
-		for (String param : params) {
-			String name = param.split("=")[0];
-			String value = param.split("=")[1];
-			map.put(name, value);
+		for (String param : params) {
+			String[] paramTokens = param.split("=");
+			if(paramTokens != null && paramTokens.length == 2) {
+				String name = param.split("=")[0];
+				String value = param.split("=")[1];
+				map.put(name, value);
+			} else {
+				if(s_logger.isDebugEnabled())
+					s_logger.debug("Invalid paramemter in URL found. param: " + param);
+			}
 		}
 		return map;
 	}