From 346a6fe80a2dba71fbca15283155cfbc0d36ff98 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 28 Oct 2011 17:23:11 -0700
Subject: [PATCH] Fixed NPE.

---
 server/src/com/cloud/api/ApiResponseHelper.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index cbf149f2fee..4c22de4318a 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2383,8 +2383,10 @@ public class ApiResponseHelper implements ResponseGenerator {
                 sgr.setDescription(sgd.getDescription());
                 
                 Account account = ApiDBUtils.findAccountByNameDomain(sgd.getAccountName(), sgd.getDomainId());
-                populateAccount(sgr, account.getId());
-                populateDomain(sgr, sgd.getDomainId());
+                if (account != null) {
+                    populateAccount(sgr, account.getId());
+                    populateDomain(sgr, account.getDomainId());
+                }
                 
                 sgr.setObjectName(sgd.getObjectName());
                 securityGroupResponse.add(sgr);