Add error messages to previous fixes