DSS-430: bug fix: NullPointerException