Changes in error messages when fixing Trac #8649