fix NPE
Merge remote-tracking branch 'origin/master' into jira/PJSM-207