diff --git a/arkoala/framework/native/src/events.cc b/arkoala/framework/native/src/events.cc
index 82c7e74face3787d660d1dd8d8baa36f594995ea..bb9e9015ccd91347488702bcb8ac618206e75e6a 100644
--- a/arkoala/framework/native/src/events.cc
+++ b/arkoala/framework/native/src/events.cc
@@ -4,6 +4,7 @@
 #include <stdexcept>
 #include "events.h"
 #include "common-interop.h"
+#include "interop-types.h"
 
 static std::deque<EventBuffer> eventQueue;
 
@@ -13,7 +14,7 @@ void sendEvent(const EventBuffer* event) {
 
 KInt impl_CheckArkoalaGeneratedEvents(KByte* result, KInt size) {
     if (((size_t)size) < sizeof(EventBuffer::buffer))
-        throw std::invalid_argument("Expected buffer size be not less than sizeof(EventBuffer) bytes");
+        INTEROP_FATAL("Expected buffer size be not less than sizeof(EventBuffer) bytes");
 
     if (!eventQueue.size())
         return 0;
diff --git a/interop/src/cpp/napi/convertors-napi.cc b/interop/src/cpp/napi/convertors-napi.cc
index 7fa237507d1856f7b851ffd9c156d77f81c4e3fe..a9b16c83e4b9c4c8d367889a64573865d5d5a4bb 100644
--- a/interop/src/cpp/napi/convertors-napi.cc
+++ b/interop/src/cpp/napi/convertors-napi.cc
@@ -291,7 +291,7 @@ const std::vector<std::pair<std::string, napi_type_t>>& Exports::getMethods(cons
     auto it = implementations.find(module);
     if (it == implementations.end()) {
         LOGE("Module %s is not registered", module.c_str());
-        throw "Fatal error";
+        INTEROP_FATAL("Fatal error");
     }
     return it->second;
 }
diff --git a/interop/src/cpp/napi/convertors-napi.h b/interop/src/cpp/napi/convertors-napi.h
index 29adb12654b5845aac16c86837db2881c16d7fbc..e1c370105579374139facc05f05d33902bb9d248 100644
--- a/interop/src/cpp/napi/convertors-napi.h
+++ b/interop/src/cpp/napi/convertors-napi.h
@@ -29,6 +29,7 @@
 #include <native_node_api.h>
 #endif
 #include "koala-types.h"
+#include "interop-types.h"
 
 // TODO: switch to more generic convertors eventually.
 template<class T>
@@ -476,7 +477,7 @@ inline KLength getArgument<KLength>(const CallbackInfo& info, int index) {
       break;
     }
     default:
-      throw "Error, unexpected KLength type";
+      INTEROP_FATAL("Error, unexpected KLength type");
   }
   return result;
 }