MSS-100: Add new error code
Merge branch 'feature/MSS-102' into feature/MSS-103