Fixes a crash on startup.
Merge pull request #9 from rcarragher/master

Fixes a startup crash