slightly improve the error message for #630