Changes to the null pointer exception that was thrown
Merge branch 'master' of https://github.com/Gnewt/bainbridgefirst