Fix error handling cases