diff --git a/src/foundation_pEp_jniadapter_AbstractEngine.cc b/src/foundation_pEp_jniadapter_AbstractEngine.cc
index 145438c..2b61d19 100644
--- a/src/foundation_pEp_jniadapter_AbstractEngine.cc
+++ b/src/foundation_pEp_jniadapter_AbstractEngine.cc
@@ -331,6 +331,7 @@ extern "C" {
         }
         catch (RuntimeError& ex) {
             throw_pEp_Exception(env, ex.status);
+            jvm->DetachCurrentThread();
             return;
         }
     }