Handle errors correctly