0001-Be-more-robust-to-different-types-of-errors-when-imp.patch
