Cleanup messy error messages