Catch Null error
Merge branch 'master' of https://github.com/yeokm1/nus-soc-print