diff --git a/src/main/java/net/floodlightcontroller/dhcpserver/DHCPSwitchFlowSetter.java b/src/main/java/net/floodlightcontroller/dhcpserver/DHCPSwitchFlowSetter.java
index 2fcbb486dc04dfc267b92bbf0a1f5146a7b96d92..5e921442c73fdb1d78f6fe58d0df84ad3f71c6fc 100644
--- a/src/main/java/net/floodlightcontroller/dhcpserver/DHCPSwitchFlowSetter.java
+++ b/src/main/java/net/floodlightcontroller/dhcpserver/DHCPSwitchFlowSetter.java
@@ -77,6 +77,11 @@ public class DHCPSwitchFlowSetter implements IFloodlightModule, IOFSwitchListene
 		 */
 		IOFSwitch sw = switchService.getSwitch(dpid);
 		
+		//fix concurrency flaw
+		if (sw == null){
+			return;
+		}
+		
 		OFFlowAdd.Builder flow = sw.getOFFactory().buildFlowAdd();
 		Match.Builder match = sw.getOFFactory().buildMatch();
 		ArrayList<OFAction> actionList = new ArrayList<OFAction>();