diff --git a/dCommon/Diagnostics.cpp b/dCommon/Diagnostics.cpp
index 46c17e43..2ed27fef 100644
--- a/dCommon/Diagnostics.cpp
+++ b/dCommon/Diagnostics.cpp
@@ -120,6 +120,8 @@ void CatchUnhandled(int sig) {
 		if (eptr) std::rethrow_exception(eptr);
 	} catch(const std::exception& e) {
 		LOG("Caught exception: '%s'", e.what());
+	} catch (...) {
+		LOG("Caught unknown exception.");
 	}
 
 #ifndef INCLUDE_BACKTRACE
diff --git a/thirdparty/SQLite/CppSQLite3.h b/thirdparty/SQLite/CppSQLite3.h
index 7ae8a8b7..70c4b8e8 100644
--- a/thirdparty/SQLite/CppSQLite3.h
+++ b/thirdparty/SQLite/CppSQLite3.h
@@ -36,10 +36,11 @@
 #include "sqlite3.h"
 #include <cstdio>
 #include <cstring>
+#include <exception>
 
 #define CPPSQLITE_ERROR 1000
 
-class CppSQLite3Exception
+class CppSQLite3Exception : public std::exception
 {
 public:
 
@@ -54,6 +55,8 @@ public:
     const int errorCode() { return mnErrCode; }
 
     const char* errorMessage() { return mpszErrMess; }
+    
+    const char* what() const noexcept override { return mpszErrMess; }
 
     static const char* errorCodeAsString(int nErrCode);