BS-9613 Fix error message behavior