diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 6d90655ad..02868216e 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
index 06adf8632..2e852135e 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -1967,7 +1967,9 @@ class PokemonStorageScreen
     box = selected[0]
     index = selected[1]
     if @storage[box, index]
-      raise _INTL("Position {1},{2} is not empty...", box, index)
+      pbDisplay("Can't place that there.")
+      return
+      echoln _INTL("Position {1},{2} is not empty...", box, index)
     end
     if box != -1 && index >= @storage.maxPokemon(box)
       pbDisplay("Can't place that there.")
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 649f42151..958509229 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ