From 2f832fddff4786dbc3cafd5934cf65e3c6f2db99 Mon Sep 17 00:00:00 2001
From: Edison Su <sudison@gmail.com>
Date: Thu, 24 Jul 2014 17:01:23 -0700
Subject: [PATCH] CLOUDSTACK-7164: fix NPE

---
 server/src/com/cloud/user/AccountManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 7a889f17375..75a97bc29f9 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1406,7 +1406,9 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M
         AccountVO account = _accountDao.findById(accountId);
 
         if (account == null || account.getRemoved() != null) {
-            s_logger.info("The account:" + account.getAccountName() + " is already removed");
+            if (account != null) {
+                s_logger.info("The account:" + account.getAccountName() + " is already removed");
+            }
             return true;
         }