diff --git a/src/clang_complete.cc b/src/clang_complete.cc
index bbac2320..15b0761e 100644
--- a/src/clang_complete.cc
+++ b/src/clang_complete.cc
@@ -5,11 +5,12 @@
 #include "log.hh"
 #include "platform.h"
 
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendDiagnostic.h"
+#include <clang/Frontend/CompilerInstance.h>
+#include <clang/Frontend/FrontendDiagnostic.h>
 #include <clang/Sema/CodeCompleteConsumer.h>
 #include <llvm/ADT/Twine.h>
 #include <llvm/Config/llvm-config.h>
+#include <llvm/Support/CrashRecoveryContext.h>
 #include <llvm/Support/Threading.h>
 using namespace clang;
 using namespace llvm;
diff --git a/src/clang_tu.cc b/src/clang_tu.cc
index 9e2b3ac2..64c4a4ec 100644
--- a/src/clang_tu.cc
+++ b/src/clang_tu.cc
@@ -100,7 +100,7 @@ std::unique_ptr<ClangTranslationUnit> ClangTranslationUnit::Create(
         /*UserFilesAreVolatile=*/true, false,
         ret->PCHCO->getRawReader().getFormat(), &ErrUnit));
   };
-  if (!RunSafely(CRC, parse)) {
+  if (!CRC.RunSafely(parse)) {
     LOG_S(ERROR)
         << "clang crashed for " << filepath << "\n"
         << StringJoin(args, " ") + " -fsyntax-only";
@@ -116,7 +116,7 @@ std::unique_ptr<ClangTranslationUnit> ClangTranslationUnit::Create(
 int ClangTranslationUnit::Reparse(llvm::CrashRecoveryContext &CRC,
                                   const WorkingFiles::Snapshot &snapshot) {
   int ret = 1;
-  auto parse = [&]() { ret = Unit->Reparse(PCHCO, GetRemapped(snapshot)); };
-  (void)RunSafely(CRC, parse);
+  (void)CRC.RunSafely(
+      [&]() { ret = Unit->Reparse(PCHCO, GetRemapped(snapshot)); });
   return ret;
 }
diff --git a/src/clang_tu.h b/src/clang_tu.h
index 741d9a40..a20ad74e 100644
--- a/src/clang_tu.h
+++ b/src/clang_tu.h
@@ -22,16 +22,6 @@ Range FromTokenRange(const clang::SourceManager &SM, const clang::LangOptions &L
                      clang::SourceRange R,
                      llvm::sys::fs::UniqueID *UniqueID = nullptr);
 
-template <typename Fn>
-bool RunSafely(llvm::CrashRecoveryContext &CRC, Fn &&fn) {
-  const char *env = getenv("CCLS_CRASH_RECOVERY");
-  if (env && strcmp(env, "0") == 0) {
-    fn();
-    return true;
-  }
-  return CRC.RunSafely(fn);
-}
-
 struct ClangTranslationUnit {
   static std::unique_ptr<ClangTranslationUnit>
   Create(const std::string &filepath, const std::vector<std::string> &args,
diff --git a/src/indexer.cc b/src/indexer.cc
index 1f11b90b..e047e1dc 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -1153,7 +1153,7 @@ std::vector<std::unique_ptr<IndexFile>> Index(
         /*CaptureDiagnostics=*/true, 0, false, false,
         /*UserFilesAreVolatile=*/true);
   };
-  if (!RunSafely(CRC, compile)) {
+  if (!CRC.RunSafely(compile)) {
     LOG_S(ERROR) << "clang crashed for " << file;
     return {};
   }
diff --git a/src/main.cc b/src/main.cc
index 11c7bb24..63c5148b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -8,6 +8,7 @@
 using namespace ccls;
 
 #include <llvm/Support/CommandLine.h>
+#include <llvm/Support/CrashRecoveryContext.h>
 #include <llvm/Support/Process.h>
 #include <llvm/Support/Program.h>
 #include <llvm/Support/Signals.h>
@@ -55,7 +56,9 @@ int main(int argc, char** argv) {
   }
 
   pipeline::Init();
-  idx::IndexInit();
+  const char *env = getenv("CCLS_CRASH_RECOVERY");
+  if (!env || strcmp(env, "0") != 0)
+    CrashRecoveryContext::Enable();
 
   bool language_server = true;