Trap another NPE
Merge pull request #4 from garethbowles/master

Trap another NPE