diff --git a/Marlin/gcode.h b/Marlin/gcode.h
index 42a5c89b140519083da7fa93506e4606d27a6a85..b819fd075d0f12c9fd3bc56c01fa4b3de474ed54 100644
--- a/Marlin/gcode.h
+++ b/Marlin/gcode.h
@@ -36,7 +36,11 @@
 //#define DEBUG_GCODE_PARSER
 
 #if ENABLED(DEBUG_GCODE_PARSER)
-  #include "hex_print_routines.h"
+  #if ENABLED(AUTO_BED_LEVELING_UBL)
+    extern char* hex_address(const void * const w);
+  #else  
+    #include "hex_print_routines.h"
+  #endif
   #include "serial.h"
 #endif
 
@@ -132,7 +136,7 @@ public:
       const uint8_t ind = LETTER_OFF(c);
       if (ind >= COUNT(param)) return false; // Only A-Z
       const bool b = TEST(codebits[PARAM_IND(ind)], PARAM_BIT(ind));
-      if (b) value_ptr = command_ptr + param[ind];
+      if (b) value_ptr = param[ind] ? command_ptr + param[ind] : (char*)NULL;
       return b;
     }