fix to nullpointerexceptions
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU