diff --git a/src/main/java/cactusServer/entities/MovableObject.java b/src/main/java/cactusServer/entities/MovableObject.java
index d160936..bd87b98 100644
--- a/src/main/java/cactusServer/entities/MovableObject.java
+++ b/src/main/java/cactusServer/entities/MovableObject.java
@@ -35,15 +35,15 @@
 
 	public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity,
 			Quaternion3D angle, Attribute attribute, int modelID) {
+		setPrim(new Box());
+		setObject(new Object3D("", prim));
+		setPlaceable(object);
 		setPosition(position);
 		setVelocity(velocity);
 		setAngularVelocity(angularVelocity);
 		setAngle(angle);
 		setAttribute(attribute);
 		setModel(modelID);
-		setPrim(new Box());
-		setObject(new Object3D("", prim));
-		setPlaceable(object);
 	}
 
 	public Position3D getPosition() {
diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java
index 148d7a5..8cfa5d0 100644
--- a/src/main/java/cactusServer/entities/Player.java
+++ b/src/main/java/cactusServer/entities/Player.java
@@ -114,12 +114,12 @@
 
 	public void setPosition(Position3D position) {
 		this.position = position;
-		((Object3D) getPlaceable().getBody()).setPosition(position);
+		if(getPlaceable() != null)((Object3D) getPlaceable().getBody()).setPosition(position);
 	}
 
 	public void setAngle(Quaternion3D angle) {
 		this.angle = angle;
-		((Object3D) getPlaceable().getBody()).apply(angle, false);
+		if(getPlaceable() != null)((Object3D) getPlaceable().getBody()).apply(angle, false);
 	}
 
 	public void setCameraState(CameraState cameraState) {