diff --git a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
index 9d58115..e23cb81 100644
--- a/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
+++ b/apps/ofagent/src/main/java/org/onosproject/ofagent/impl/OFSwitchManager.java
@@ -165,6 +165,11 @@
         log.info("Added virtual OF switch for {}", deviceId);
 
         OFAgent ofAgent = ofAgentService.agent(networkId);
+        if (ofAgent == null) {
+            log.error("OFAgent for network {} does not exist", networkId);
+            return;
+        }
+
         if (ofAgent.state() == STARTED) {
             connectController(ofSwitch, ofAgent.controllers());
         }