improved error message
Merge branch 'CHEF-3735'