Fixed Handling NullPointerException
Merge branch 'master' of https://github.com/Botkilla2k12/se262project.git