diff --git a/lib/utils/riverpod/riverpod_providers/generated_providers/token_container_notifier.dart b/lib/utils/riverpod/riverpod_providers/generated_providers/token_container_notifier.dart
index 06f4cc6e..4da73301 100644
--- a/lib/utils/riverpod/riverpod_providers/generated_providers/token_container_notifier.dart
+++ b/lib/utils/riverpod/riverpod_providers/generated_providers/token_container_notifier.dart
@@ -649,7 +649,12 @@ class TokenContainerNotifier extends _$TokenContainerNotifier
     await _finalizationMutex.acquire();
     if (container is! TokenContainerUnfinalized) {
       _finalizationMutex.release();
-      throw ArgumentError('Container must not be finalized');
+      if (container is TokenContainerFinalized) {
+        Logger.info('Container is already finalized, skipping rollout: ${container.serial}');
+        return container;
+      }
+      Logger.error('Unexpected container type for rollout: ${container.runtimeType}');
+      return null;
     }
     urlIsOk ??=
         ((await ContainerShowContainerUrlDialog.showDialog(container)) == true);