From a01f7e76c34342974749e90a64c062b304a39bd1 Mon Sep 17 00:00:00 2001
From: Sigert Goeminne <sigert.goeminne@nuagenetworks.net>
Date: Fri, 17 Feb 2017 11:05:58 +0100
Subject: [PATCH] CLOUDSTACK-9790: fix NPE in case of Basic zone.

---
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 0254a64c767..f57498287b6 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2919,7 +2919,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
                         ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network);
                 if (sameSubnet) break;
             }
-        } else {
+        } else if(network.getGateway() != null && network.getCidr() != null) {
             vlanGateway = network.getGateway();
             vlanNetmask = NetUtils.getCidrNetmask(network.getCidr());
             sameSubnet = hasSameSubnet(ipv4, vlanGateway, vlanNetmask, newVlanGateway, newVlanNetmask, startIP, endIP,