diff --git a/mu-init.subx b/mu-init.subx
index 321dd66a..8fcf84e3 100644
--- a/mu-init.subx
+++ b/mu-init.subx
@@ -14,20 +14,19 @@ Entry:
   bd/copy-to-ebp 0/imm32
   #
 #?   (main 0 0 Primary-bus-secondary-drive)
-  (test-create-function-with-new-name)
-#?   # always first run tests
-#?   (run-tests)
-#?   (num-test-failures)  # => eax
-#?   # call main if tests all passed
-#?   {
-#?     3d/compare-eax-and 0/imm32
-#?     75/jump-if-!= break/disp8
-#?     c7 0/subop/copy *Running-tests? 0/imm32/false
-#?     (clear-real-screen)
-#?     c7 0/subop/copy *Real-screen-cursor-x 0/imm32
-#?     c7 0/subop/copy *Real-screen-cursor-y 0/imm32
-#?     (main 0 0 Primary-bus-secondary-drive)
-#?   }
+  # always first run tests
+  (run-tests)
+  (num-test-failures)  # => eax
+  # call main if tests all passed
+  {
+    3d/compare-eax-and 0/imm32
+    75/jump-if-!= break/disp8
+    c7 0/subop/copy *Running-tests? 0/imm32/false
+    (clear-real-screen)
+    c7 0/subop/copy *Real-screen-cursor-x 0/imm32
+    c7 0/subop/copy *Real-screen-cursor-y 0/imm32
+    (main 0 0 Primary-bus-secondary-drive)
+  }
 
   # hang indefinitely
   {
diff --git a/shell/environment.mu b/shell/environment.mu
index 2ec7da79..5f0f20f0 100644
--- a/shell/environment.mu
+++ b/shell/environment.mu
@@ -767,7 +767,7 @@ fn test-create-nonexistent-global {
   check-background-color-in-screen-row screen, 0xf/bg=modal, 0xf/y, "                                                                                                                                ", "F - test-create-nonexistent-global/test2-15"
 }
 
-fn test-create-function-with-new-name {
+fn pending-test-create-function-with-new-name {
   var env-storage: environment
   var env/esi: (addr environment) <- address env-storage
   initialize-environment env
diff --git a/shell/global.mu b/shell/global.mu
index a76e7148..8eb4552d 100644
--- a/shell/global.mu
+++ b/shell/global.mu
@@ -103,6 +103,11 @@ fn write-globals out: (addr stream byte), _self: (addr global-table) {
       write out, " . ["
       var curr-input-ah/eax: (addr handle gap-buffer) <- get curr, input
       var curr-input/eax: (addr gap-buffer) <- lookup *curr-input-ah
+      {
+        compare curr-input, 0
+        break-if-!=
+        abort "null gap buffer"
+      }
       append-gap-buffer curr-input, out
       write out, "])\n"
     }