Added NPE protection
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git