Added null checks and other minor code clean-ups
Merge branch 'master' of https://github.com/ozbek/sofft