Patch up broken error messages