Index: trunk/FACT++/src/InterpreterV8.cc
===================================================================
--- trunk/FACT++/src/InterpreterV8.cc	(revision 18382)
+++ trunk/FACT++/src/InterpreterV8.cc	(revision 18383)
@@ -1452,4 +1452,6 @@
 void InterpreterV8::JsHandleEvent(const EventImp &evt, uint64_t cnt, const string &service)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1520,4 +1522,6 @@
 void InterpreterV8::JsHandleState(const std::string &server, const State &state)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1626,7 +1630,9 @@
 int InterpreterV8::JsHandleInterrupt(const EventImp &evt)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
-    if (fThreadId<0)
+    if (fThreadId<0 || fInterruptCallback.IsEmpty())
         return -42;