#1205 Improved error message