Improve error message from 7499