1.82 better error preserving