diff --git a/src/core/modules/impl/handler/AbstractContractHandler.ts b/src/core/modules/impl/handler/AbstractContractHandler.ts
index 7f4be1d..63050ef 100644
--- a/src/core/modules/impl/handler/AbstractContractHandler.ts
+++ b/src/core/modules/impl/handler/AbstractContractHandler.ts
@@ -142,7 +142,8 @@ export abstract class AbstractContractHandler<State> implements HandlerApi<State
           const lastErrorKey = errorKeys[errorKeys.length - 1] as string;
           const lastErrorMessage = stateWithValidity?.cachedValue?.errorMessages[lastErrorKey];
           // don't judge me..
-          if (lastErrorMessage.startsWith('[SkipUnsafeError]')) {
+          // FIXME: also - '?' is stinky...
+          if (lastErrorMessage?.startsWith('[SkipUnsafeError]')) {
             throw new ContractError(lastErrorMessage);
           }
         }