diff --git a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java
index 6ff92db..3de671e 100644
--- a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntime.java
@@ -45,6 +45,7 @@
 
 		// TODO optimize locking of NetworkGraph
 		graph.acquireReadLock();
+		log.debug("NetworkGraph: {}", graph.getLinks());
 
 		for (IntentOperation intentOp: intentOpList) {
 			switch (intentOp.operator) {
@@ -62,9 +63,10 @@
 				Switch srcSwitch = graph.getSwitch(spIntent.getSrcSwitchDpid());
 				Switch dstSwitch = graph.getSwitch(spIntent.getDstSwitchDpid());
 				if (srcSwitch == null || dstSwitch == null) {
-					log.error("Switch not found: {}, {}",
+					log.error("Switch not found. src:{}, dst:{}, NetworkGraph:{}",
 							spIntent.getSrcSwitchDpid(),
-							spIntent.getDstSwitchDpid());
+							spIntent.getDstSwitchDpid(),
+							graph.getLinks());
 					pathIntentOpList.add(Operator.ERROR, new ErrorIntent(
 							ErrorType.SWITCH_NOT_FOUND,
 							"Switch not found.",
@@ -87,7 +89,7 @@
 				}
 				Path path = tree.getPath(dstSwitch);
 				if (path == null) {
-					log.error("Path not found: {}", spIntent.toString());
+					log.error("Path not found. Intent: {}, NetworkGraph:{}", spIntent.toString(), graph.getLinks());
 					pathIntentOpList.add(Operator.ERROR, new ErrorIntent(
 							ErrorType.PATH_NOT_FOUND,
 							"Path not found.",
diff --git a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
index 087e503..45043fe 100755
--- a/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/intent/runtime/PathCalcRuntimeModule.java
@@ -314,7 +314,9 @@
 				affectedPaths.addAll(pathIntents.getIntentsByDpid(switchEvent.getDpid()));
 			p.log("end_getIntentsByDpid");
 		}
+		p.log("begin_reroutePaths");
 		reroutePaths(affectedPaths);
+		p.log("end_reroutePaths");
 		p.flushLog();
 	}
 
