Wibbles to 'Tidy up the error messages we get from TH'