diff --git a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
index 133f29c..4415120 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/forwarding/Forwarding.java
@@ -489,7 +489,9 @@
 					installedFlowPath.dataPath().dstPort(),
 					srcMacAddress, dstMacAddress);
 			//pendingFlows.remove(pathToRemove);
-			pendingFlows.get(installedPath).firstHopOutPort = outPort;
+			PushedFlow existingFlow = pendingFlows.get(installedPath);
+			if (existingFlow != null)
+			    existingFlow.firstHopOutPort = outPort;
 		}
 		
 		for (PacketToPush packet : packets) {