diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp
index 20a4509a354..b0152f869bc 100644
--- a/ui/jsp/pod.jsp
+++ b/ui/jsp/pod.jsp
@@ -286,7 +286,7 @@
                     Cluster:</label>
                 <select class="select" id="cluster_select">
                 </select>
-                <div id="cluster_dropdown_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                <div id="cluster_select_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li>           
             <li input_group="general">
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 713bf7e779a..26d81446513 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -451,11 +451,11 @@ function bindAddHostButton($leftmenuItem1) {
 	            var $thisDialog = $(this);		            
 	            			   
 			    var hypervisor = $thisDialog.find("#host_hypervisor").val();
-		        var clusterRadio = $thisDialog.find("input[name=cluster]:checked").val();				
-			
+		     	
 		        // validate values
-		        var isValid = true;									
-		        if(hypervisor == "VmWare") {
+		        var isValid = true;		
+			    isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"), false);  //required, reset error text					    			
+				if(hypervisor == "VmWare") {
 			        isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg"));
 			        isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg"));
 			        isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg"));	
@@ -479,9 +479,7 @@ function bindAddHostButton($leftmenuItem1) {
 		        array1.push("&podId="+podId);
 						    			    		            
 		        var clusterId = $thisDialog.find("#cluster_select").val();			    
-			    if (clusterId != null && clusterId != '-1') {
-				    array1.push("&clusterid="+clusterId);
-			    }
+			    array1.push("&clusterid="+clusterId);			    
 		        	
 			    if(hypervisor == "VmWare") {
 			        var username = trim($thisDialog.find("#host_vcenter_username").val());
@@ -553,31 +551,6 @@ function bindAddHostButton($leftmenuItem1) {
     });        
 }
 
-/*
-function clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, clusterId, $thisDialog) {    
-    if(clusterRadio == "new_cluster_radio") {    //*** new cluster ***                         
-        refreshClusterUnderPod($("#pod_" + podId), newClusterName);  //this function will click the new cluster node                         
-        $thisDialog.find("#new_cluster_name").val("");   
-    }        
-    else if(clusterRadio == "existing_cluster_radio") { //*** existing cluster ***  
-   
-        if (clusterId != null && clusterId != '-1') {
-            $("#cluster_"+clusterId).find("#cluster_name").click();
-        }    
-    }         
-}
-*/
-
-/*
-function expandClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, clusterId, $thisDialog) {        
-    if (clusterId != null && clusterId != '-1') {
-        var $arrow = $("#cluster_"+clusterId).find("#cluster_arrow");
-        if($arrow.hasClass("expanded_close"))
-            $arrow.click();
-    }               
-}
-*/
-
 function bindAddPrimaryStorageButton($leftmenuItem1) {    
     var $button = $("#add_primarystorage_button");  
     $button.unbind("click").bind("click", function(event) {          
@@ -640,6 +613,9 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
 	    	var $protocolSelector = $("#add_pool_protocol", dialogAddPool);	    	
 	    	var objCluster = mapClusters['cluster_'+curOption];
 	    	
+	    	if(objCluster == null)
+   	            return;
+	    	
 	    	if(objCluster.hypervisortype == "KVM") {
 	    		$protocolSelector.empty();
 	    		$protocolSelector.append('<option value="nfs">NFS</option>');
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 48374a05811..172396220ea 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -1385,22 +1385,6 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
 	    $dialogAddPool.find("#add_pool_protocol").empty().html('<option value="nfs">NFS</option>');	
     bindEventHandlerToDialogAddPool($dialogAddPool);	
     
-    /*
-    $.ajax({
-        data: createURL("command=listZones&available=true"),
-	    dataType: "json",
-	    success: function(json) {
-		    var zones = json.listzonesresponse.zone;
-		    var zoneSelect = $dialogAddPool.find("#zone_dropdown").empty();								
-		    if (zones != null && zones.length > 0) {
-			    for (var i = 0; i < zones.length; i++) 
-				    zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>"); 				    
-		    }	
-		    //$dialogAddPool.find("#zone_dropdown").change();	//comment out to avoid race condition, do it before dialog box pops up	    
-	    }
-    });
-	*/
-	
     $dialogAddPool.find("#zone_dropdown").bind("change", function(event) {
 	    var zoneId = $(this).val();
 	    $.ajax({
@@ -1455,6 +1439,9 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
     	var $protocolSelector = $("#add_pool_protocol", $dialogAddPool);
     	var objCluster = mapClusters['cluster_'+curOption];
     	
+    	if(objCluster == null)
+    	    return;
+    	
     	if(objCluster.hypervisortype == "KVM") {
     		$protocolSelector.empty();
     		$protocolSelector.append('<option value="nfs">NFS</option>');