server no longer failing on null check
Merge branch 'master' of github.com:theJenix/bluetooth-test