diff --git a/auth/lib/ui/settings/data/import/bitwarden_import.dart b/auth/lib/ui/settings/data/import/bitwarden_import.dart
index 8149a8099a..eec93dbdb4 100644
--- a/auth/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/auth/lib/ui/settings/data/import/bitwarden_import.dart
@@ -109,8 +109,8 @@ Future<int?> _processBitwardenExportFile(
           Code.steamDigits,
         );
       } else {
-        var issuer = item['name'];
-        var account = item['login']['username'];
+        var issuer = item['name'] ?? '';
+        var account = item['login']['username'] ?? '';
         code = Code.fromAccountAndSecret(
           Type.totp,
           account,
diff --git a/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart b/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
index 5adaa73cf5..1b00086fe7 100644
--- a/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
+++ b/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
@@ -105,7 +105,7 @@ Future<int?> _processRaivoExportFile(BuildContext context, String path) async {
       otpUrl =
           'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter';
     } else {
-      throw Exception('Invalid OTP type');
+      throw Exception('Invalid OTP type $kind');
     }
     parsedCodes.add(Code.fromOTPAuthUrl(otpUrl));
   }
diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml
index 3d70dbd2aa..b7a0e75c86 100644
--- a/auth/pubspec.yaml
+++ b/auth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ente_auth
 description: ente two-factor authenticator
-version: 3.0.7+307
+version: 3.0.8+308
 publish_to: none
 
 environment: