Nullpointer verif
Merge branch 'master' of https://github.com/SIMS-Topaz/sims-topaz-android.git