Fix for null pointer exceptions when run against newer code.
Added FIXME tags on some dodgy code.
Authored by: knohax@gmail.com 2012-01-25
Parent: [r93]
Child: [r95]