Fixing the NullPointerException error.
Merge branch 'master' of https://github.com/agincourt009/cs3210-proj4