Fix: Null'ed pointer usage, possible access violation.

This fixes issue #700, replaces #701.