Adding a null check for issue #116 and #123
Merge branch 'master' of https://github.com/deanhiller/playorm