diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
index e4e9a76..d1284a2 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowEventHandler.java
@@ -663,6 +663,13 @@
 	    if (topologyEvents.isEmpty())
 		return;
 
+	    // TODO: Code for debugging purpose only
+	    for (EventEntry<TopologyElement> eventEntry : topologyEvents) {
+		TopologyElement topologyElement = eventEntry.eventData();
+		log.debug("Topology Event: {} {}", eventEntry.eventType(),
+			  topologyElement.toString());
+	    }
+
 	    //
 	    // TODO: Fake the topology read it by checking the cache with
 	    // the old topology and ignoring topology events that don't make
@@ -674,9 +681,6 @@
 	    for (EventEntry<TopologyElement> eventEntry : topologyEvents) {
 		TopologyElement topologyElement = eventEntry.eventData();
 
-		log.debug("Topology Event: {} {}", eventEntry.eventType(),
-			  topologyElement.toString());
-
 		switch (eventEntry.eventType()) {
 		case ENTRY_ADD:
 		    isTopologyModified |= topology.addTopologyElement(topologyElement);