Fixed bug causing NullPointerException
Merge pull request #237 from acz-icm/master

Fixed bug causing NullPointerException