NullPointerException fixed

fixed
Merge branch 'master' of https://github.com/SirKenzi/ProjectXahun