diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4959aafd..d9d9e41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [4.0.0-alpha.158](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.158) (2022-04-09)
+
+
+### Features
+
+* reports source of ESC errors when possible ([#568](https://github.com/godot-escoria/escoria-demo-game/issues/568)) ([baee79f](https://github.com/godot-escoria/escoria-demo-game/commit/baee79f5a05249d2dcd16111d4243582887b27ee))
+
+
+
 ## [4.0.0-alpha.157](https://github.com/godot-escoria/escoria-demo-game/compare/v0.0.0...v4.0.0-alpha.157) (2022-04-08)
 
 
diff --git a/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd b/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd
index ed0c9469..1f329b7f 100644
--- a/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd
+++ b/addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd
@@ -56,7 +56,7 @@ func run(command_params: Array) -> int:
 				"transition_done"
 			) != transition_id:
 				pass
-	
+
 		if command_params[0] == "main":
 			escoria.game_scene.show_main_menu()
 		elif command_params[0] == "pause":
diff --git a/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd
index 60470f2a..0fe5bff0 100644
--- a/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd
+++ b/addons/escoria-core/game/core-scripts/esc/esc_object_manager.gd
@@ -479,7 +479,7 @@ func _object_exists_in_room(object: ESCObject, room_key: ESCRoomObjectsKey) -> b
 	for room_container in room_objects:
 		if _compare_container_to_key(room_container, room_key) \
 			and room_container.objects.has(object.global_id):
-	
+
 			return true
 
 	return false
diff --git a/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd b/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
index 33d63cce..397060c6 100644
--- a/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
+++ b/addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd
@@ -84,7 +84,7 @@ func change_scene(room_path: String, enable_automatic_transitions: bool) -> void
 			escoria.logger.debug(
 				"Awaiting transition %s (out) to be finished." % transition_id
 			)
-	
+
 			yield(escoria.main.scene_transition, "transition_done")
 
 		# Hide main and pause menus
@@ -295,7 +295,7 @@ func _perform_script_events(room: ESCRoom) -> void:
 			rc = yield(escoria.event_manager, "event_finished")
 		if rc[0] != ESCExecution.RC_OK:
 			return rc[0]
-	
+
 		yielded = true
 
 		# Hide main and pause menus
@@ -368,7 +368,7 @@ func _perform_script_events(room: ESCRoom) -> void:
 			rc = yield(escoria.event_manager, "event_finished")
 		if rc[0] != ESCExecution.RC_OK:
 			return rc[0]
-	
+
 	# Now that :ready is finished, if FORCE_LAST_SCENE_NULL was true, reset it
 	# to false
 	if escoria.globals_manager.get_global( \
diff --git a/addons/escoria-core/game/core-scripts/log/esc_logger.gd b/addons/escoria-core/game/core-scripts/log/esc_logger.gd
index 20d309a3..064566c7 100644
--- a/addons/escoria-core/game/core-scripts/log/esc_logger.gd
+++ b/addons/escoria-core/game/core-scripts/log/esc_logger.gd
@@ -205,7 +205,7 @@ func error(string: String, args = [], do_savegame: bool = true):
 
 			_log(message, true)
 			escoria.set_game_paused(true)
-	
+
 			if is_instance_valid(escoria.main.current_scene):
 				escoria.main.current_scene.game.show_crash_popup(files_to_send)
 
diff --git a/addons/escoria-ui-simplemouse/game.gd b/addons/escoria-ui-simplemouse/game.gd
index 05cb75ea..5a7b9b34 100644
--- a/addons/escoria-ui-simplemouse/game.gd
+++ b/addons/escoria-ui-simplemouse/game.gd
@@ -209,7 +209,7 @@ func element_focused(element_id: String) -> void:
 	if escoria.action_manager.current_action != VERB_USE \
 			and escoria.action_manager.current_tool == null \
 			and target_obj is ESCItem:
-	
+
 			$mouse_layer/verbs_menu.set_by_name(
 				target_obj.default_action
 			)