Blunt fix for null references errors.
Merge pull request #8 from PeterHatch/master

Blunt fix for null references errors.