diff --git a/Session/Onboarding/RestoreVC.swift b/Session/Onboarding/RestoreVC.swift
index 0e6496757..5fbf82436 100644
--- a/Session/Onboarding/RestoreVC.swift
+++ b/Session/Onboarding/RestoreVC.swift
@@ -198,7 +198,7 @@ final class RestoreVC: BaseVC {
         do {
             let hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic)
             let seed = Data(hex: hexEncodedSeed)
-            let (ed25519KeyPair, x25519KeyPair) = try! Identity.generate(from: seed)
+            let (ed25519KeyPair, x25519KeyPair) = try Identity.generate(from: seed)
             Onboarding.Flow.recover.preregister(with: seed, ed25519KeyPair: ed25519KeyPair, x25519KeyPair: x25519KeyPair)
             mnemonicTextView.resignFirstResponder()
             
diff --git a/SessionUtilitiesKit/Database/Models/Identity.swift b/SessionUtilitiesKit/Database/Models/Identity.swift
index 9d08731f5..4f3f82ee8 100644
--- a/SessionUtilitiesKit/Database/Models/Identity.swift
+++ b/SessionUtilitiesKit/Database/Models/Identity.swift
@@ -53,7 +53,7 @@ extension ECKeyPair {
 
 public extension Identity {
     static func generate(from seed: Data) throws -> (ed25519KeyPair: Sign.KeyPair, x25519KeyPair: ECKeyPair) {
-        assert(seed.count == 16)
+        guard (seed.count == 16) else { throw GeneralError.invalidSeed }
         let padding = Data(repeating: 0, count: 16)
         
         guard
diff --git a/SessionUtilitiesKit/General/General.swift b/SessionUtilitiesKit/General/General.swift
index 714184ee3..72576fb56 100644
--- a/SessionUtilitiesKit/General/General.swift
+++ b/SessionUtilitiesKit/General/General.swift
@@ -19,6 +19,7 @@ public enum General {
 }
 
 public enum GeneralError: Error {
+    case invalidSeed
     case keyGenerationFailed
 }