diff --git a/r2r/src/parameters.rs b/r2r/src/parameters.rs
index 8c56b06c7..1497af201 100644
--- a/r2r/src/parameters.rs
+++ b/r2r/src/parameters.rs
@@ -63,6 +63,35 @@ try_into_template!(Vec<i64>, "integer array", ParameterValue::IntegerArray(value
 try_into_template!(Vec<f64>, "double array", ParameterValue::DoubleArray(value) => value);
 try_into_template!(Vec<String>, "string array", ParameterValue::StringArray(value) => value);
 
+macro_rules! try_into_option_template {
+    ($ty:ty, $expected_type_name:literal, $variant:pat => $result:expr) => {
+        impl TryInto<Option<$ty>> for ParameterValue {
+            type Error = WrongParameterType;
+
+            fn try_into(self) -> std::prelude::v1::Result<Option<$ty>, Self::Error> {
+                match self {
+                    $variant => Ok(Some($result)),
+                    ParameterValue::NotSet => Ok(None),
+                    _ => Err(WrongParameterType {
+                        expected_type_name: $expected_type_name,
+                        actual_type_name: self.type_name(),
+                    }),
+                }
+            }
+        }
+    };
+}
+
+try_into_option_template!(bool, "boolean", ParameterValue::Bool(value) => value);
+try_into_option_template!(i64, "integer", ParameterValue::Integer(value) => value);
+try_into_option_template!(f64, "double", ParameterValue::Double(value) => value);
+try_into_option_template!(String, "string", ParameterValue::String(value) => value);
+try_into_option_template!(Vec<bool>, "boolean array", ParameterValue::BoolArray(value) => value);
+try_into_option_template!(Vec<u8>, "byte array", ParameterValue::ByteArray(value) => value);
+try_into_option_template!(Vec<i64>, "integer array", ParameterValue::IntegerArray(value) => value);
+try_into_option_template!(Vec<f64>, "double array", ParameterValue::DoubleArray(value) => value);
+try_into_option_template!(Vec<String>, "string array", ParameterValue::StringArray(value) => value);
+
 impl ParameterValue {
     pub fn type_name(&self) -> &'static str {
         match self {