diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 45c78b1b8bd..32b806ec040 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3011,6 +3011,9 @@ public class ManagementServerImpl implements ManagementServer {
             // cleanup sub-domains first
             for (DomainVO domain : domains) {
                 success = (success && cleanupDomain(domain.getId(), domain.getAccountId()));
+                if (!success) {
+                    s_logger.warn("Failed to cleanup domain id=" + domain.getId());
+                }
             }
         }
 
@@ -3020,7 +3023,10 @@ public class ManagementServerImpl implements ManagementServer {
             sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
             List<AccountVO> accounts = _accountDao.search(sc, null);
             for (AccountVO account : accounts) {
-                success = (success && _accountMgr.cleanupAccount(account, UserContext.current().getCallerUserId(), UserContext.current().getCaller()));
+                success = (success && _accountMgr.deleteAccount(account, UserContext.current().getCallerUserId(), UserContext.current().getCaller()));
+                if (!success) {
+                    s_logger.warn("Failed to cleanup account id=" + account.getId() + " as a part of domain cleanup");
+                }
             }
         }
         
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 1d64994f1bc..ee715cc8f7f 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -814,8 +814,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
             if (success) {
                 s_logger.debug("Successfully deleted snapshots directories for all volumes under account " + accountId + " across all zones");
             }
-            // else, there are no snapshots, hence no directory to delete.
-            
             
             // clean up templates
             List<VMTemplateVO> userTemplates = _templateDao.listByAccountId(accountId);
@@ -830,6 +828,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
             }
             
             if (!allTemplatesDeleted) {
+                s_logger.warn("Failed to delete templates while removing account id=" + accountId);
                 accountCleanupNeeded = true;
             }