null pointer fixes
Merge branch 'master' of https://github.com/kmangzz/Tutor.me