diff --git a/core/src/com/cloud/storage/VMTemplateHostVO.java b/core/src/com/cloud/storage/VMTemplateHostVO.java
index 9b558c63a0e..d30e4fd6e76 100755
--- a/core/src/com/cloud/storage/VMTemplateHostVO.java
+++ b/core/src/com/cloud/storage/VMTemplateHostVO.java
@@ -297,5 +297,10 @@ public class VMTemplateHostVO implements VMTemplateStorageResourceAssoc {
     public long getTemplateSize() {
 	    return -1;
 	}
+	
+	@Override
+    public String toString() {
+	    return new StringBuilder("TmplHost[").append(id).append("-").append(templateId).append("-").append(hostId).append(installPath).append("]").toString();
+	}
 
 }
diff --git a/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java b/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
index cd4894624d9..109d7677aab 100644
--- a/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
+++ b/core/src/com/cloud/storage/VMTemplateStoragePoolVO.java
@@ -231,6 +231,10 @@ public class VMTemplateStoragePoolVO implements VMTemplateStorageResourceAssoc{
 		Long hid = new Long(poolId);
 		return tid.hashCode()+hid.hashCode();
 	}
-	
+	
+	@Override
+    public String toString() {
+	    return new StringBuilder("TmplPool[").append(id).append("-").append(templateId).append("-").append("poolId").append("-").append(installPath).append("]").toString();
+	}
 
 }
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 211fba660c3..ef435703429 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1722,9 +1722,15 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
                                     + " templates to cleanup on secondary storage host: " + secondaryStorageHost.getName());
                             for (VMTemplateHostVO destroyedTemplateHostVO : destroyedTemplateHostVOs) {
                                 if (!_tmpltMgr.templateIsDeleteable(destroyedTemplateHostVO)) {
-                                    s_logger.debug("Not deleting template at: " + destroyedTemplateHostVO.getInstallPath());
+                                    if (s_logger.isDebugEnabled()) {
+                                        s_logger.debug("Not deleting template at: " + destroyedTemplateHostVO);
+                                    }
                                     continue;
                                 }
+                                
+                                if (s_logger.isDebugEnabled()) {
+                                    s_logger.debug("Deleting template host: " + destroyedTemplateHostVO);
+                                }
 
                                 String installPath = destroyedTemplateHostVO.getInstallPath();
 
@@ -1732,7 +1738,7 @@ public class StorageManagerImpl implements StorageManager, StorageService, Manag
                                     Answer answer = _agentMgr.easySend(hostId, new DeleteTemplateCommand(destroyedTemplateHostVO.getInstallPath()));
 
                                     if (answer == null || !answer.getResult()) {
-                                        s_logger.debug("Failed to delete template at: " + destroyedTemplateHostVO.getInstallPath() + " due to "
+                                        s_logger.debug("Failed to delete " + destroyedTemplateHostVO + " due to "
                                                 + ((answer == null) ? "answer is null" : answer.getDetails()));
                                     } else {
                                         _vmTemplateHostDao.remove(destroyedTemplateHostVO.getId());
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 8c2db9bc5e7..35523cb4c9e 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -1015,6 +1015,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
 			hostId = poolHostVOs.get(0).getHostId();
 		}
 		
+		if (s_logger.isDebugEnabled()) {
+		    s_logger.debug("Evicting " + templatePoolVO);
+		}
 		DestroyCommand cmd = new DestroyCommand(pool, templatePoolVO);
 		Answer answer = _agentMgr.easySend(hostId, cmd);