diff --git a/src/game_interpreter_map.cpp b/src/game_interpreter_map.cpp
index 338a3da96b..d457ba43ba 100644
--- a/src/game_interpreter_map.cpp
+++ b/src/game_interpreter_map.cpp
@@ -560,15 +560,14 @@ bool Game_Interpreter_Map::CommandEnterHeroName(RPG::EventCommand const& com) {
 	Game_Temp::hero_name_id = com.parameters[0];
 	Game_Temp::hero_name_charset = com.parameters[1];
 
-	if (com.parameters[2] != 0) {
-		Game_Actor *actor = Game_Actors::GetActor(Game_Temp::hero_name_id);
-
-		if (!actor) {
-			Output::Warning("EnterHeroName: Invalid actor ID %d", Game_Temp::hero_name_id);
-			Game_Temp::hero_name.clear();
-		} else {
-			Game_Temp::hero_name = actor->GetName();
-		}
+	Game_Actor *actor = Game_Actors::GetActor(Game_Temp::hero_name_id);
+
+	if (!actor) {
+		Output::Error("EnterHeroName: Invalid actor ID %d", Game_Temp::hero_name_id);
+	}
+
+	if (com.parameters[2]) {
+		Game_Temp::hero_name = actor->GetName();
 	} else {
 		Game_Temp::hero_name.clear();
 	}