diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 46523d25aad..bc7858f05b3 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -109,6 +109,10 @@
     <property name="name" value="Basic"/>
   </bean>
 
+  <bean id="hyervisorTemplateAdapter" class="com.cloud.template.HyervisorTemplateAdapter">
+    <property name="name" value="HypervisorAdapter"/>
+  </bean>
+
   <!--
     Authenticators
   -->
diff --git a/server/src/com/cloud/template/TemplateAdapterBase.java b/server/src/com/cloud/template/TemplateAdapterBase.java
index d0a0ec207b6..d97f05dcca0 100755
--- a/server/src/com/cloud/template/TemplateAdapterBase.java
+++ b/server/src/com/cloud/template/TemplateAdapterBase.java
@@ -87,6 +87,10 @@ public abstract class TemplateAdapterBase implements TemplateAdapter {
 	public String getName() {
 		return _name;
 	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
 
 	@Override
 	public boolean start() {
diff --git a/utils/src/com/cloud/utils/component/AdapterBase.java b/utils/src/com/cloud/utils/component/AdapterBase.java
index 40d6b8c6538..29f3c239017 100644
--- a/utils/src/com/cloud/utils/component/AdapterBase.java
+++ b/utils/src/com/cloud/utils/component/AdapterBase.java
@@ -54,7 +54,7 @@ public class AdapterBase implements Adapter {
 
     public static <T extends Adapter> T getAdapterByName(List<T> adapters, String name) {
     	for(T adapter : adapters) {
-    		if(adapter.getName().equalsIgnoreCase(name))
+    		if(adapter.getName() != null && adapter.getName().equalsIgnoreCase(name))
     			return adapter;
     	}
     	return null;