Cleaning up redundant error messages