diff --git a/src/Main.cake b/src/Main.cake
index 870184e..d651634 100644
--- a/src/Main.cake
+++ b/src/Main.cake
@@ -1266,11 +1266,13 @@ Rush Hour database from Michael Fogleman.\n\n")
 
   (write-progression-data)
 
-  (when g-puzzle-list (free (type-cast g-puzzle-list (* void)))
-        (set g-puzzle-list null))
+  (when g-puzzle-list
+    (free (type-cast g-puzzle-list (* void)))
+    (set g-puzzle-list null))
 
-  (when g-progression-puzzles (free (type-cast g-progression-puzzles (* void)))
-        (set g-progression-puzzles null))
+  (when g-progression-puzzles
+    (free (type-cast g-progression-puzzles (* void)))
+    (set g-progression-puzzles null))
 
   (each-in-array
    textures-to-destroy i