Wibbles to error messages following fixing Trac #7696 and #7697
Test Trac #7641
Test Trac #7696, #7697