add patch remove-unnecessary-error-check