Removed over-long error messages