I don't like these two changes, as it was really useful to know which host threw that error. I am also thinking that this message change is only necessary when the 1.8 server is used?