Fix crash on startup
Merge pull request #5 from andygeers/master

Fix crash on startup