Merge pull request #116 from int3l/master

Prevent nil pointer dereference