Prevent startup crash
Merge pull request #286 from dlsniper/fix-startup-issue

Prevent startup crash (fixes #256)