Cleaned up error output a bit