diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index baf1e0fc44c..5620015508f 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -97,8 +97,12 @@ public class ApiServlet extends HttpServlet {
                     if (session != null) {  
                         Long userId = (Long)session.getAttribute("userid");
                         Account account = (Account)session.getAttribute("accountobj");
+                        Long accountId = null;
+                        if (account != null) {
+                            accountId = account.getId();
+                        }
                         auditTrailSb.insert(0, "(userId="+userId+ 
-                                " accountId="+ account==null ? null:account.getId()+ 
+                                " accountId="+ accountId + 
                                 " sessionId="+session.getId() +")" );
                         if (userId != null) {
                             _apiServer.logoutUser(userId);