MSS-59 fix new error messages here since library splitted off
Merge branch 'feature/MSS-59' into develop