handle null definitions
Merge branch 'master' of github.com:envato/yodado