diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index e38ffc911e6..f6b23fae9db 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -587,7 +587,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
             throw new InvalidParameterValueException("Please specify a valid hypervisor name");
         }
         
-        Discoverer discoverer = getMatchingDiscover(cmd.getHypervisor());
+        Discoverer discoverer = getMatchingDiscover(hypervisorType);
         if(discoverer == null) {
             throw new InvalidParameterValueException("Please specify a valid hypervisor");
         }
@@ -608,49 +608,57 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
             clusterId = cluster.getId();
         }
         
+        boolean success = false;
         try {
-    		uri = new URI(UriUtils.encodeURIComponent(url));
-    		if (uri.getScheme() == null) {
-                throw new InvalidParameterValueException("uri.scheme is null " + url + ", add http:// as a prefix");
-            } else if (uri.getScheme().equalsIgnoreCase("http")) {
-    			if (uri.getHost() == null || uri.getHost().equalsIgnoreCase("") || uri.getPath() == null || uri.getPath().equalsIgnoreCase("")) {
-    				throw new InvalidParameterValueException("Your host and/or path is wrong.  Make sure it's of the format http://hostname/path");
-    			}
-    		}
-    	} catch (URISyntaxException e) {
-			throw new InvalidParameterValueException(url + " is not a valid uri");
-    	}
-        
-        List<HostVO> hosts = new ArrayList<HostVO>();
-        Map<? extends ServerResource, Map<String, String>> resources = null;
-        
-        try {
-        	resources = discoverer.find(dcId, podId, clusterId, uri, username, password);
-        } catch(Exception e) {
-        	s_logger.info("Exception in external cluster discovery process with discoverer: " + discoverer.getName());
+	        try {
+	    		uri = new URI(UriUtils.encodeURIComponent(url));
+	    		if (uri.getScheme() == null) {
+	                throw new InvalidParameterValueException("uri.scheme is null " + url + ", add http:// as a prefix");
+	            } else if (uri.getScheme().equalsIgnoreCase("http")) {
+	    			if (uri.getHost() == null || uri.getHost().equalsIgnoreCase("") || uri.getPath() == null || uri.getPath().equalsIgnoreCase("")) {
+	    				throw new InvalidParameterValueException("Your host and/or path is wrong.  Make sure it's of the format http://hostname/path");
+	    			}
+	    		}
+	    	} catch (URISyntaxException e) {
+				throw new InvalidParameterValueException(url + " is not a valid uri");
+	    	}
+	        
+	        List<HostVO> hosts = new ArrayList<HostVO>();
+	        Map<? extends ServerResource, Map<String, String>> resources = null;
+	        
+	        try {
+	        	resources = discoverer.find(dcId, podId, clusterId, uri, username, password);
+	        } catch(Exception e) {
+	        	s_logger.info("Exception in external cluster discovery process with discoverer: " + discoverer.getName());
+	        }
+	        if (resources != null) {
+	            for (Map.Entry<? extends ServerResource, Map<String, String>> entry : resources.entrySet()) {
+	                ServerResource resource = entry.getKey();
+	                AgentAttache attache = simulateStart(resource, entry.getValue(), true);
+	                if (attache != null) {
+	                    hosts.add(_hostDao.findById(attache.getId()));
+	                }
+	                discoverer.postDiscovery(hosts, _nodeId);
+	            }
+	            s_logger.info("External cluster has been successfully discovered by " + discoverer.getName());
+	            success = true;
+	            return hosts;
+	        }
+	    	
+	        s_logger.warn("Unable to find the server resources at " + url);
+	        throw new DiscoveryException("Unable to add the external cluster");
+        } finally {
+        	if(!success) {
+        		_clusterDao.remove(clusterId);
+        	}
         }
-        if (resources != null) {
-            for (Map.Entry<? extends ServerResource, Map<String, String>> entry : resources.entrySet()) {
-                ServerResource resource = entry.getKey();
-                AgentAttache attache = simulateStart(resource, entry.getValue(), true);
-                if (attache != null) {
-                    hosts.add(_hostDao.findById(attache.getId()));
-                }
-                discoverer.postDiscovery(hosts, _nodeId);
-            }
-            s_logger.info("External cluster has been successfully discovered by " + discoverer.getName());
-            return hosts;
-        }
-    	
-        s_logger.warn("Unable to find the server resources at " + url);
-        throw new DiscoveryException("Unable to add the external cluster");
     }
     
-    private Discoverer getMatchingDiscover(String hypervisorType) {
+    private Discoverer getMatchingDiscover(Hypervisor.HypervisorType hypervisorType) {
         Enumeration<Discoverer> en = _discoverers.enumeration();
         while (en.hasMoreElements()) {
             Discoverer discoverer = en.nextElement();
-        	if(discoverer.matchHypervisor(hypervisorType))
+        	if(discoverer.getHypervisorType() == hypervisorType)
         		return discoverer;
     	}
         return null;
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 9da372acb5e..651b9ddcfb0 100644
--- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -493,6 +493,11 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     	return Hypervisor.HypervisorType.XenServer.toString().equalsIgnoreCase(hypervisor);
     }
     
+    @Override
+	public Hypervisor.HypervisorType getHypervisorType() {
+    	return Hypervisor.HypervisorType.XenServer;
+    }
+    
     @Override
     public void postDiscovery(List<HostVO> hosts, long msId)  throws DiscoveryException{
         //do nothing
diff --git a/server/src/com/cloud/resource/Discoverer.java b/server/src/com/cloud/resource/Discoverer.java
index e88f6f0dea2..eba1aaf7c61 100644
--- a/server/src/com/cloud/resource/Discoverer.java
+++ b/server/src/com/cloud/resource/Discoverer.java
@@ -44,4 +44,5 @@ public interface Discoverer extends Adapter {
 	void postDiscovery(List<HostVO> hosts, long msId)  throws DiscoveryException;
 	
 	boolean matchHypervisor(String hypervisor);
+	Hypervisor.HypervisorType getHypervisorType();
 }
diff --git a/server/src/com/cloud/resource/DummyHostDiscoverer.java b/server/src/com/cloud/resource/DummyHostDiscoverer.java
index 9a0c5f3b93b..a50c5eb1c33 100644
--- a/server/src/com/cloud/resource/DummyHostDiscoverer.java
+++ b/server/src/com/cloud/resource/DummyHostDiscoverer.java
@@ -95,6 +95,11 @@ public class DummyHostDiscoverer implements Discoverer {
     	return false;
     }
     
+    @Override
+	public Hypervisor.HypervisorType getHypervisorType() {
+    	return Hypervisor.HypervisorType.None;
+    }
+    
 	@Override
 	public void postDiscovery(List<HostVO> hosts, long msId) {
 		//do nothing
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
index 1b079abbc06..92a9ac75493 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
@@ -244,6 +244,11 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov
     	return true;
     }
 
+    @Override
+	public Hypervisor.HypervisorType getHypervisorType() {
+    	return Hypervisor.HypervisorType.None;
+    }
+    
 	@Override
 	public void postDiscovery(List<HostVO> hosts, long msId) {
 		if (_useServiceVM) {