diff --git a/src/response.rs b/src/response.rs
index 5a4f285..1a42a57 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -229,7 +229,7 @@ impl<V: FromValue> FromValue for Option<V> {
     fn from_value(v: Value) -> ClientResult<Self> {
         match v {
             Value::Null => Ok(None),
-            v => FromValue::from_value(v),
+            v => FromValue::from_value(v).map(|v| Some(v)),
         }
     }
 }