Hacked client to produce useful error messages