Removed stupid NULL
Intensive Whack-A-Mole debugging (TM).
More mad debugging.