diff --git a/core/net/src/main/java/org/onosproject/net/domain/impl/DomainManager.java b/core/net/src/main/java/org/onosproject/net/domain/impl/DomainManager.java
index 9a8a257..8f0db20 100644
--- a/core/net/src/main/java/org/onosproject/net/domain/impl/DomainManager.java
+++ b/core/net/src/main/java/org/onosproject/net/domain/impl/DomainManager.java
@@ -31,6 +31,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -81,7 +82,9 @@
     @Override
     public DomainId getDomain(DeviceId deviceId) {
         checkNotNull(deviceId);
-        return checkNotNull(getAnnotatedDomainId(deviceService.getDevice(deviceId)));
+        return Optional.ofNullable(deviceService.getDevice(deviceId))
+                    .map(this::getAnnotatedDomainId)
+                    .orElse(null);
     }
 
     private DomainId getAnnotatedDomainId(Device device) {