From bd5f1a7de65f6ed107d0eb9bc30b15739885893e Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Sat, 6 Nov 2010 16:54:14 -0700
Subject: [PATCH] Fixed NPE if addVPNUser fails because it was unable to reach
 the domR.

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index d825e2ec207..bbd925e4f3a 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2851,6 +2851,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 			EventUtils.saveEvent(userId, account.getId(), EventTypes.EVENT_VPN_USER_ADD, "Added a VPN user for account: " + account.getAccountName() + " username= " + cmd.getUserName());
 		} else {
 			EventUtils.saveEvent(userId, account.getId(), EventVO.LEVEL_ERROR, EventTypes.EVENT_VPN_USER_ADD, "Unable to add VPN user for account: ", account.getAccountName() + " username= " + cmd.getUserName());
+			throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Unable to add VPN user for account: "+ account.getAccountName() + " username= " + cmd.getUserName());
 		}
 		return user;