diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
index aee2ecb..514e389 100755
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowDatabaseOperation.java
@@ -676,14 +676,20 @@
      * @return true on success, otherwise false.
      */
     static boolean deleteAllFlows(DBOperation dbHandler) {
-	Iterable<IFlowPath> allFlowPaths = dbHandler.getAllFlowPaths();
-	for (IFlowPath flowPathObj : allFlowPaths) {
-	    if (flowPathObj == null)
-		continue;
+	try {
+	    // Get all Flow IDs
+	    Iterable<IFlowPath> allFlowPaths = dbHandler.getAllFlowPaths();
+	    for (IFlowPath flowPathObj : allFlowPaths) {
+		if (flowPathObj == null)
+		    continue;
 
-	    deleteIFlowPath(dbHandler, flowPathObj);
+		deleteIFlowPath(dbHandler, flowPathObj);
+	    }
+	    dbHandler.commit();
+	} catch (Exception e) {
+	    log.error("Exception deleting all Flow Paths from Network MAP: ", e);
+	    return false;
 	}
-	dbHandler.commit();
 
 	return true;
     }