Improve error message (push to 6.6 branch)