Removed possible NullPointerException during start
Merge pull request #169 from vralfy/master

Removed possible NullPointerException during start