diff --git a/scenes/room/states/room_entering.gd b/scenes/room/states/room_entering.gd
index 80bf749..01b5a82 100644
--- a/scenes/room/states/room_entering.gd
+++ b/scenes/room/states/room_entering.gd
@@ -3,10 +3,17 @@ extends RoomState
 
 func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
 	print("entering room")
-	room.player = room.player_scene.instantiate()
-	room.add_child(room.player)
-	room.player.global_position = room.initial_spawn
+	room.player = _instantiate_player()
+	assert(room.player != null, "player is null")
 	room.camera.global_position = room.config.camera_position
 	
 	finished.emit(PLAYING)
 	return
+
+
+func _instantiate_player() -> Player:
+	var p: Player = room.player_scene.instantiate()
+	room.add_child(p)
+	p.global_position = room.initial_spawn
+	
+	return p