KCINFR-979: making s2s error messages end user maintainable

You probably didn't need to check this twice.