Handled null pointer exception which was happening during startup
Merge pull request #262 from pfschwartz/develop

Handled null pointer exception which was happening during startup