Fixed a null pointer exception.
Built v0.2.1
Merge branch 'hotfix/0.2.1'