diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 04b8d4f7714..0184cbec094 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1463,9 +1463,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag } // Check if zone exists - DataCenterVO zone = _dcDao.findById(zoneId); + if (zoneId == null) { + throw new InvalidParameterValueException("Please specify a valid zone."); + } - if (zoneId == null || zone == null) { + DataCenterVO zone = _dcDao.findById(zoneId); + if (zone == null) { throw new InvalidParameterValueException("Please specify a valid zone."); }