diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java
index 23dd93c..51cad77 100644
--- a/src/main/java/cactusServer/entities/Instance.java
+++ b/src/main/java/cactusServer/entities/Instance.java
@@ -184,6 +184,14 @@
 		return this;
 	}
 	
+	public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, int modelID) {
+		Character character = characterMap.get(characterId);
+		if (character != null) {
+			character.update(position, angle, modelID);
+		}
+		return character;
+	}
+	
 	public Bullet updateBullet(String playerId, String bulletId, Position3D position, Quaternion3D angle) {
 		HashMap<String, Bullet> map = bulletMap.get(playerId);
 		if (map != null) {
diff --git a/src/main/java/cactusServer/resources/CharactersRest.java b/src/main/java/cactusServer/resources/CharactersRest.java
index 04f85c6..0d0d838 100644
--- a/src/main/java/cactusServer/resources/CharactersRest.java
+++ b/src/main/java/cactusServer/resources/CharactersRest.java
@@ -71,10 +71,10 @@
 	public void updateCharacter(@PathParam("instanceId") String instanceId, @PathParam("characterId") String characterId,
 			@FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle,
 			@FormParam("modelID") int modelID) {
-		Character character = Instances.getInstance().getInstance(instanceId).getCharacter(characterId);
+		Instance instance = Instances.getInstance().getInstance(instanceId);
+		Character character = instance.updateCharacter(characterId, position, angle, modelID);
 		if (character == null) {
 			throw new WebApplicationException(400);
 		}
-		character.update(position, angle, modelID);
 	}
 }