diff --git a/CodeGenerator.Designer.cs b/CodeGenerator.Designer.cs
index 9370f127d..981799e5c 100644
--- a/CodeGenerator.Designer.cs
+++ b/CodeGenerator.Designer.cs
@@ -135,7 +135,6 @@
             this.CB_Slot.Name = "CB_Slot";
             this.CB_Slot.Size = new System.Drawing.Size(35, 21);
             this.CB_Slot.TabIndex = 12;
-            this.CB_Slot.SelectedIndexChanged += new System.EventHandler(this.changeSourceIndex);
             // 
             // CB_Box
             // 
@@ -177,7 +176,6 @@
             this.CB_Box.Name = "CB_Box";
             this.CB_Box.Size = new System.Drawing.Size(35, 21);
             this.CB_Box.TabIndex = 13;
-            this.CB_Box.SelectedIndexChanged += new System.EventHandler(this.changeSourceIndex);
             // 
             // B_Load
             // 
diff --git a/CodeGenerator.cs b/CodeGenerator.cs
index 4948508b6..bf0bb942d 100644
--- a/CodeGenerator.cs
+++ b/CodeGenerator.cs
@@ -56,6 +56,12 @@ namespace PKHeX
                         + CB_Box.SelectedIndex * (232 * 30) // Box Shift
                         + CB_Slot.SelectedIndex * 232,      // Slot Shift
                     newdata, 0, 0xE8);
+
+                if (newdata.SequenceEqual(new Byte[0xE8]))
+                {
+                    System.Media.SystemSounds.Exclamation.Play();
+                    return false;
+                }
             }
             else if (CB_Source.SelectedIndex == 2)
             {
@@ -122,10 +128,6 @@ namespace PKHeX
             }
         }
 
-        private void changeSourceIndex(object sender, EventArgs e)
-        {
-        }
-
         public static string RemoveTroublesomeCharacters(TextBox tb)
         {
             string inString = tb.Text;