diff --git a/include/MGIS/Context.hxx b/include/MGIS/Context.hxx
index 8f7c0c8d7..07db6f8aa 100644
--- a/include/MGIS/Context.hxx
+++ b/include/MGIS/Context.hxx
@@ -67,7 +67,11 @@ namespace mgis {
           requires((!internal::OptionalTraits<T>::isSpecialized) &&
                    (std::is_rvalue_reference_v<decltype(v)>)) {
         if (isInvalid(v)) {
-          raise(this->ctx.getErrorMessage());
+          if (policy == FailureHandlerPolicy::RAISE) {
+            raise(this->ctx.getErrorMessage());
+          } else {
+            this->ctx.abort();
+          }
         }
         return std::move(v);
       }