Only give one error dialog per diff
(cherry picked from commit e3c93ceb4cbbdfb885495abc8ff557caf004d949)