Fixed occasional errors on startup
Merge pull request #4 from Metapyziks/master

Fixed occasional errors on startup