BS-1088
Improve error message