Improve error msg
Proper fixed for #1710