diff --git a/src/HexManiac.Core/Models/PokemonModel.cs b/src/HexManiac.Core/Models/PokemonModel.cs
index 2119dadf..25de1694 100644
--- a/src/HexManiac.Core/Models/PokemonModel.cs
+++ b/src/HexManiac.Core/Models/PokemonModel.cs
@@ -2410,7 +2410,7 @@ namespace HavenSoft.HexManiac.Core.Models {
          }
 
          var index = BinarySearch(run.Start);
-         if (index > 0) {
+         if (index >= 0) {
             changeToken.RemoveRun(runs[index]);
             RemoveIndex(index);
          }
diff --git a/src/HexManiac.Core/ViewModels/EditorViewModel.cs b/src/HexManiac.Core/ViewModels/EditorViewModel.cs
index 7a092d3b..6023c4e4 100644
--- a/src/HexManiac.Core/ViewModels/EditorViewModel.cs
+++ b/src/HexManiac.Core/ViewModels/EditorViewModel.cs
@@ -1199,7 +1199,7 @@ namespace HavenSoft.HexManiac.Core.ViewModels {
             } else if (run.CreateDataFormat(viewPort.Model, run.Start, true, 16) is SpriteDecorator decorator) {
                sprite = decorator.Pixels;
             } else {
-               continue;
+               sprite = null;
             }
             var anchor = model.GotoShortcuts[i].GotoAnchor;
             var text = model.GotoShortcuts[i].DisplayText;