Fix for a null pointer exception
Merge pull request #102 from timothysc/0.4.0-null-pointer-mr

Fix for a null pointer exception #90