Handle the error message better