Ensure proper encoding of error messages

Created by  Eelco Dolstra  on October 3, 2013
2MSFKTD5BSZSAYUYVETLZW2GAH65CFUYWWNTQCT3LBBCJGGWPHEQC
Change contents