Refactored checkNotNull checks

* Moved them to their respective assignments to save some lines
Merge branch 'master' of github.com:Softhouse/jargo