2 files changed, 8 insertions, 3 deletions
diff --git a/odcsim/odcsim-api/src/main/kotlin/com/atlarge/odcsim/flow/StateFlow.kt b/odcsim/odcsim-api/src/main/kotlin/com/atlarge/odcsim/flow/StateFlow.kt
index 0410bd95..50add0ad 100644
--- a/odcsim/odcsim-api/src/main/kotlin/com/atlarge/odcsim/flow/StateFlow.kt
+++ b/odcsim/odcsim-api/src/main/kotlin/com/atlarge/odcsim/flow/StateFlow.kt
@@ -70,10 +70,10 @@ private class StateFlowImpl<T>(initialValue: T) : StateFlow<T> {
      */
     private val flow = chan.asFlow()
 
-    public override var value: T
-        get() = chan.value
+    public override var value: T = initialValue
         set(value) {
             chan.offer(value)
+            field = value
         }
 
     @InternalCoroutinesApi
diff --git a/odcsim/odcsim-engine-omega/src/main/kotlin/com/atlarge/odcsim/engine/omega/OmegaSimulationEngine.kt b/odcsim/odcsim-engine-omega/src/main/kotlin/com/atlarge/odcsim/engine/omega/OmegaSimulationEngine.kt
index 4edf94d2..934af293 100644
--- a/odcsim/odcsim-engine-omega/src/main/kotlin/com/atlarge/odcsim/engine/omega/OmegaSimulationEngine.kt
+++ b/odcsim/odcsim-engine-omega/src/main/kotlin/com/atlarge/odcsim/engine/omega/OmegaSimulationEngine.kt
@@ -37,6 +37,7 @@ import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.coroutineContext
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.Delay
 import kotlinx.coroutines.DisposableHandle
@@ -174,6 +175,10 @@ public class OmegaSimulationEngine(override val name: String) : SimulationEngine
             }
         }
 
+        private val exceptionHandler = CoroutineExceptionHandler { _, exception ->
+            log.error("Uncaught exception", exception)
+        }
+
         // SimulationContext
         override val key: CoroutineContext.Key<*> = SimulationContext.Key
 
@@ -192,7 +197,7 @@ public class OmegaSimulationEngine(override val name: String) : SimulationEngine
         override val parent: Domain = parent ?: this
 
         @InternalCoroutinesApi
-        override val coroutineContext: CoroutineContext = this + CoroutineName(name) + dispatcher + job
+        override val coroutineContext: CoroutineContext = this + CoroutineName(name) + dispatcher + job + exceptionHandler
 
         override fun toString(): String = path
     }