diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp
index ae851c7f549..a7f42ddebf8 100644
--- a/lib/Support/FileUtilities.cpp
+++ b/lib/Support/FileUtilities.cpp
@@ -241,5 +241,8 @@ int llvm::DiffFilesWithTolerance(const sys::Path &FileA,
   } catch (const std::string &Msg) {
     if (Error) *Error = Msg;
     return 2;
+  } catch (...) {
+    *Error = "Unknown Exception Occurred";
+    return 2;
   }
 }