added more debugging to NPE's
Merge branch 'master' of https://github.com/acmeair/acmeair