Merge "Remove unnecessary ask on error passing"