diff --git a/g2core/g2core.cppproj b/g2core/g2core.cppproj
index c227a946..2b1f1c3d 100644
--- a/g2core/g2core.cppproj
+++ b/g2core/g2core.cppproj
@@ -73,7 +73,7 @@
         <InterfaceName>SWD</InterfaceName>
       </ToolOptions>
       <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
-      <ToolNumber>J41800019454</ToolNumber>
+      <ToolNumber>J41800030015</ToolNumber>
       <ToolName>Atmel-ICE</ToolName>
     </com_atmel_avrdbg_tool_atmelice>
     <UseGdb>True</UseGdb>
@@ -100,7 +100,7 @@
       <HWProgramCounterSampling>True</HWProgramCounterSampling>
     </PercepioTrace>
     <preserveEEPROM>true</preserveEEPROM>
-    <avrtoolserialnumber>J41800019454</avrtoolserialnumber>
+    <avrtoolserialnumber>J41800030015</avrtoolserialnumber>
     <avrdeviceexpectedsignature>0x284E0A60</avrdeviceexpectedsignature>
     <avrtoolinterfaceclock>2000000</avrtoolinterfaceclock>
     <custom>
diff --git a/g2core/stepper.cpp b/g2core/stepper.cpp
index 142153e4..d79e17b1 100644
--- a/g2core/stepper.cpp
+++ b/g2core/stepper.cpp
@@ -608,6 +608,9 @@ static void _load_move()
         mp_runtime_command(st_pre.bf);
 
     } // else null - WARNING - We cannot printf from here!! Causes crashes.
+    else {
+        _debug_trap("_load_move called when it's not needed?");
+    }
 
     // all other cases drop to here (e.g. Null moves after Mcodes skip to here)
     st_pre.block_type = BLOCK_TYPE_NULL;