diff --git a/SessionSnodeKit/OnionRequestAPI.swift b/SessionSnodeKit/OnionRequestAPI.swift
index 61e617c72..7a03b16f0 100644
--- a/SessionSnodeKit/OnionRequestAPI.swift
+++ b/SessionSnodeKit/OnionRequestAPI.swift
@@ -204,7 +204,11 @@ public enum OnionRequestAPI {
         } else {
             return buildPaths(reusing: []).map2 { paths in
                 if let snode = snode {
-                    return paths.filter { !$0.contains(snode) }.randomElement()!
+                    if let path = paths.filter({ !$0.contains(snode) }).randomElement() {
+                        return path
+                    } else {
+                        throw Error.insufficientSnodes
+                    }
                 } else {
                     return paths.randomElement()!
                 }