diff --git a/protobuf-serde/src/lib.rs b/protobuf-serde/src/lib.rs
index f02a4dd06..44ac302ba 100644
--- a/protobuf-serde/src/lib.rs
+++ b/protobuf-serde/src/lib.rs
@@ -15,7 +15,7 @@ pub fn serialize_singular_ptr_field<T: Serialize, S>(spf: &SingularPtrField<T>,
 {
     match spf.as_ref() {
         Some(value) => value.serialize(serializer),
-        None => serializer.serialize_none()
+        None => serializer.serialize_none(),
     }
 }
 
@@ -23,14 +23,6 @@ pub fn deserialize_singular_ptr_field<'de, D, T>(deserializer: D)
         -> Result<SingularPtrField<T>, D::Error>
     where D: Deserializer<'de>, T: Deserialize<'de>
 {
-    match Option::deserialize(deserializer) {
-        Ok(spf) => {
-            match spf {
-                Some(value) => Ok(SingularPtrField::some(value)),
-                None => Ok(SingularPtrField::none())
-            }
-        }
-        Err(err) => Err(err)
-    }
+    Option::deserialize(deserializer).map(From::from)
 }
 
diff --git a/protobuf/src/singular.rs b/protobuf/src/singular.rs
index 139c39477..44681a16a 100644
--- a/protobuf/src/singular.rs
+++ b/protobuf/src/singular.rs
@@ -395,6 +395,18 @@ impl<T> Default for SingularPtrField<T> {
     }
 }
 
+impl<T : Default> From<Option<T>> for SingularField<T> {
+    fn from(o: Option<T>) -> Self {
+        SingularField::from_option(o)
+    }
+}
+
+impl<T> From<Option<T>> for SingularPtrField<T> {
+    fn from(o: Option<T>) -> Self {
+        SingularPtrField::from_option(o)
+    }
+}
+
 impl<T : Clone + Default> Clone for SingularField<T> {
     #[inline]
     fn clone(&self) -> SingularField<T> {