diff --git a/src/lib.rs b/src/lib.rs
index 2463d2c..761c2fa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -274,8 +274,9 @@ where
     raw_url
         .as_ref()
         .map(parse_ssh_url)
-        .map(|res| res.map_err(DE::custom).map(Some))
-        .unwrap_or(Ok(None))
+        .map(|res| res.map_err(DE::custom))
+        .transpose()
+        .or(Ok(None))
 }
 
 fn parse_ssh_url(raw_url: &String) -> Result<Url, url::ParseError> {