diff --git a/lib/src/utils/uia_request.dart b/lib/src/utils/uia_request.dart
index 65511d0f..174cc106 100644
--- a/lib/src/utils/uia_request.dart
+++ b/lib/src/utils/uia_request.dart
@@ -64,7 +64,9 @@ class UiaRequest<T> {
       return res;
     } on MatrixException catch (err) {
       if (err.session == null) {
-        rethrow;
+        error = err;
+        state = UiaRequestState.fail;
+        return null;
       }
       session ??= err.session;
       final completed = err.completedAuthenticationFlows;
@@ -72,7 +74,9 @@ class UiaRequest<T> {
       params = err.authenticationParams ?? <String, dynamic>{};
       nextStages = getNextStages(flows, completed);
       if (nextStages.isEmpty) {
-        rethrow;
+        error = err;
+        state = UiaRequestState.fail;
+        return null;
       }
       return null;
     } catch (err) {