Working version for WoWMoM paper

src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java

@@ -90,8 +90,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
 	private VehicleController _controller;
 	private SimulationSetupExtractor _extractor;
 
-	private List<Location> intersections;
-
 	private double _percentageOfKnownRoutes = 1;
 
 	/**
@@ -242,7 +240,6 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
 
 				_extractor = simulationController;
 			}
-			intersections = _extractor.getAllIntersections(true);
 
 			scenarioWidth = _extractor.getScenarioWidth();
 			scenarioHeight = _extractor.getScenarioHeight();

src/de/tud/kom/p2psim/impl/topology/movement/vehicular/sumo/simulation/controller/traci/TraciSimulationController.java

@@ -626,7 +626,7 @@ public class TraciSimulationController implements VehicleController, SimulationS
 					}
 
 					inputStream.close();
-				} catch (IOException | ClassNotFoundException e) {
+				} catch (IOException | ClassNotFoundException | NullPointerException e) {
 					//Nothing to do
 				}
 			}