diff --git a/Session/Home/New Conversation/NewMessageScreen.swift b/Session/Home/New Conversation/NewMessageScreen.swift
index 3b1290ca2..72519040e 100644
--- a/Session/Home/New Conversation/NewMessageScreen.swift	
+++ b/Session/Home/New Conversation/NewMessageScreen.swift	
@@ -94,18 +94,13 @@ struct NewMessageScreen: View {
                             case .finished: break
                             case .failure(let error):
                                 modalActivityIndicator.dismiss {
-                                    var messageOrNil: String?
-                                    if let error = error as? SnodeAPIError {
+                                    let message: String = {
                                         switch error {
-                                            case .generic, .decryptionFailed, .hashingFailed, .validationFailed:
-                                                messageOrNil = "onsErrorUnableToSearch".localized()
+                                            case SnodeAPIError.onsDecryptionFailed, SnodeAPIError.onsHashingFailed,
+                                                SnodeAPIError.onsValidationFailed:
+                                                return "onsErrorUnableToSearch".localized()
                                             default: break
                                         }
-                                    }
-                                    let message: String = {
-                                        if let messageOrNil: String = messageOrNil {
-                                            return messageOrNil
-                                        }
                                         
                                         return (maybeSessionId?.prefix == .blinded15 || maybeSessionId?.prefix == .blinded25 ?
                                             "accountIdErrorInvalid".localized() :