diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
index 4f20a81..2fe43ba 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyPublisher.java
@@ -377,9 +377,11 @@
                 sw.getConnectedSince().toString());
         switchData.createStringAttribute(TopologyElement.ELEMENT_ADMIN_STATUS,
                 AdminStatus.ACTIVE.toString());
-        //setting name from config file.
-        switchData.createStringAttribute("name",
-                ret.getSwitchConfig().getName());
+        // setting name from configuration (if it exists).
+        if (ret.getSwitchConfig() != null) {
+            switchData.createStringAttribute("name",
+                    ret.getSwitchConfig().getName());
+        }
         //set the switch socketAddress and port
         switchData.createStringAttribute("remoteAddress",
                 sw.getChannelSocketAddress().toString().substring(1));