diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 47fd4ec7f..98afae273 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1435,7 +1435,12 @@ void CppCheck::executeAddonsWholeProgram(const std::map<std::string, std::size_t
         ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName));
     }
 
-    executeAddons(ctuInfoFiles);
+    try {
+        executeAddons(ctuInfoFiles);
+    catch (const InternalError& e) {
+        internalError("", "Internal error during whole program analysis: " + std::string(e.what()));
+        mExitCode = 1;
+    }
 
     for (const std::string &f: ctuInfoFiles) {
         std::remove(f.c_str());