Cleanups in error message