diff --git a/Data/Map043.rxdata b/Data/Map043.rxdata
index c3e42ef1e..c24a2ac0d 100644
Binary files a/Data/Map043.rxdata and b/Data/Map043.rxdata differ
diff --git a/Data/Map048.rxdata b/Data/Map048.rxdata
index 9971c4af9..b389f8792 100644
Binary files a/Data/Map048.rxdata and b/Data/Map048.rxdata differ
diff --git a/Data/Map067.rxdata b/Data/Map067.rxdata
index 59167e7c0..e4fafc755 100644
Binary files a/Data/Map067.rxdata and b/Data/Map067.rxdata differ
diff --git a/Data/Map068.rxdata b/Data/Map068.rxdata
index 0571deea4..9df220e31 100644
Binary files a/Data/Map068.rxdata and b/Data/Map068.rxdata differ
diff --git a/Data/Map069.rxdata b/Data/Map069.rxdata
index fee0a1445..0c446eb3d 100644
Binary files a/Data/Map069.rxdata and b/Data/Map069.rxdata differ
diff --git a/Data/Map070.rxdata b/Data/Map070.rxdata
index e9b82f8cf..ed010a25d 100644
Binary files a/Data/Map070.rxdata and b/Data/Map070.rxdata differ
diff --git a/Data/Map076.rxdata b/Data/Map076.rxdata
index 59951fbc3..f85d688b1 100644
Binary files a/Data/Map076.rxdata and b/Data/Map076.rxdata differ
diff --git a/Data/Map205.rxdata b/Data/Map205.rxdata
index 29cfe73c8..a08fca007 100644
Binary files a/Data/Map205.rxdata and b/Data/Map205.rxdata differ
diff --git a/Data/Map722.rxdata b/Data/Map722.rxdata
index baf62c3e7..60f75216f 100644
Binary files a/Data/Map722.rxdata and b/Data/Map722.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index dd5d75f65..da59533c7 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 898659285..feda0daa2 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "6.0.3"
+  GAME_VERSION_NUMBER = "6.0.4"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
index bddded9a9..0602e76f4 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
@@ -336,6 +336,10 @@ end
 #===============================================================================
 # Used when walking in tall grass, hence the additional code.
 def pbWildBattle(species, level, outcomeVar=1, canRun=true, canLose=false)
+  if !species
+    displayRandomizerErrorMessage()
+    return
+  end
   species = GameData::Species.get(species).id
   dexnum = getDexNumberForSpecies(species)
   if $game_switches[SWITCH_RANDOM_STATIC_ENCOUNTERS] && dexnum <= NB_POKEMON
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 77b58d1a7..135c996e2 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ