Fixing a NIL crash caused by new code...