From d862a09771dca8d71da1727fdd09234d602d573b Mon Sep 17 00:00:00 2001
From: Nick Livens <nick.livens@nuagenetworks.net>
Date: Mon, 2 May 2016 10:16:21 +0200
Subject: [PATCH] Nuage VSP : Fix for NPE while cleaning up account when there
 are still resources belonging to that account

---
 .../nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java b/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
index 135a552e2d5..8757ad02120 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/util/NuageVspEntityBuilder.java
@@ -109,7 +109,9 @@ public class NuageVspEntityBuilder {
         vspNetworkBuilder.domain(vspDomain);
 
         AccountVO account = _accountDao.findById(network.getAccountId());
-        vspNetworkBuilder.accountUuid(account.getUuid()).accountName(account.getAccountName());
+        if (account != null) {
+            vspNetworkBuilder.accountUuid(account.getUuid()).accountName(account.getAccountName());
+        }
 
         NetworkOfferingVO networkOffering = _networkOfferingDao.findById(network.getNetworkOfferingId());
         vspNetworkBuilder.egressDefaultPolicy(networkOffering.getEgressDefaultPolicy());