fixed unnecessary NPE
Merge branch 'develop' of github.com:motown-io/motown into develop