Merge pull request #90 from rplociennik/master

Fix a simple NULL pointer crash