Potential fix to startup crash
Merge pull request #7 from sstupka/master

Potential fix to startup crash