Protect against rare NPE
Merge pull request #32 from francoisforster/patch-1

Protect against rare NPE -- I assume you have experienced this? In an error condition or... ?