diff --git a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
index a61e1b0b0a04bdc2a17f3d6f56d4a605d75c9f3f..8b404fb768b35cebc0dc2fd6d63b7ac153f9c7e2 100644
--- a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
+++ b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
@@ -90,7 +90,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 	private MovementModel movementModel;
 
 	private PlacementModel placementModel;
-	
+
 	private final boolean registerAsInformationProviderInSiS;
 
 	/**
@@ -131,7 +131,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 			/*
 			 * Legacy support for placement models.
 			 */
-			position.set(placementModel.place(this));
+		    updateCurrentLocation(placementModel.place(this));
 		}
 
 		if (registerAsInformationProviderInSiS) {
diff --git a/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java b/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java
index cf68609cff53994f7b27a801324c9c03a3ad1449..27ed3b193676209b943c55c1ada6600fd84d1a45 100644
--- a/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java
+++ b/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java
@@ -409,7 +409,9 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
 				idComponentMatcher.put(vehicle, simLocationActuator);
 				hostVehicleIDMatching.put(simLocationActuator.getHost().getId(), vehicle);
 			} else {
-				throw new RuntimeException("Unable to assign new components. Please increase node amount" + (_reuseComponents?".":" or enable the reuse of components."));
+			    if (idComponentMatcher.size() != 0) {
+			        throw new RuntimeException("Unable to assign new components. Please increase node amount" + (_reuseComponents?".":" or enable the reuse of components."));
+			    }
 			}
 		}
 		return idComponentMatcher.get(vehicle);