diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 826e1e8a6..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 0aaf9edfa..7989f71f4 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 77834bdef..ffc3b8ac9 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 c26be3d82..df731f4ef 100644
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -2252,7 +2252,11 @@ class PokemonStorageScreen
 
 
         selectedHead =selectFusion(pokemon, heldpoke, isSuperSplicer)
-        if selectedHead == -1
+        if selectedHead == nil
+          pbDisplay(_INTL("It won't have any effect."))
+          return false
+        end
+        if selectedHead == -1 #cancelled out
           return false
         end
 
diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb
index 5de3ef365..1482ff0ee 100644
--- a/Data/Scripts/050_AddOns/New Items effects.rb	
+++ b/Data/Scripts/050_AddOns/New Items effects.rb	
@@ -1312,7 +1312,11 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
           end
 
           selectedHead =selectFusion(pokemon, poke2, supersplicers)
-          if selectedHead == -1
+          if selectedHead == -1 #cancelled
+            return false
+          end
+          if selectedHead == nil  #can't fuse (egg, etc.)
+            scene.pbDisplay(_INTL("It won't have any effect."))
             return false
           end
           selectedBase = selectedHead == pokemon ? poke2 : pokemon
@@ -1353,6 +1357,9 @@ end
 
 
 def selectFusion(pokemon, poke2, supersplicers = false)
+  return nil if !pokemon.is_a?(Pokemon) ||  !poke2.is_a?(Pokemon)
+  return nil if pokemon.egg? ||  poke2.egg?
+
   selectorWindow = FusionPreviewScreen.new(poke2, pokemon, supersplicers)#PictureWindow.new(picturePath)
   selectedHead = selectorWindow.getSelection
   selectorWindow.dispose
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index a7510bfe3..e29a490b9 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index acaa59516..ec292660a 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ