markphelps · markphelps · Dec 7, 2018 · Dec 6, 2018 · Dec 6, 2018 · Dec 6, 2018
diff --git a/bool.go b/bool.go
diff --git a/byte.go b/byte.go
diff --git a/cmd/optional/main.go b/cmd/optional/main.go
@@ -183,11 +183,16 @@ func ({{ .VariableName }} {{ .OutputName }}) MarshalJSON() ([]byte, error) {
 	if {{ .VariableName }}.Present() {
 		return json.Marshal({{ .VariableName }}.value)
 	}
-	var zero {{ .TypeName }}
-	return json.Marshal(zero)
+	return json.Marshal(nil)
 }
 
 func ({{ .VariableName }} *{{ .OutputName }}) UnmarshalJSON(data []byte) error {
+
+	if string(data) == "null" {
+		{{ .VariableName }}.value = nil
+		return nil
+	}
+
 	var value {{ .TypeName }}
 
 	if err := json.Unmarshal(data, &value); err != nil {

diff --git a/cmd/optional/testdata/optional_bar.go b/cmd/optional/testdata/optional_bar.go
diff --git a/cmd/optional/testdata/optional_foo.go b/cmd/optional/testdata/optional_foo.go
diff --git a/cmd/optional/testdata/string.go b/cmd/optional/testdata/string.go
diff --git a/complex128.go b/complex128.go
diff --git a/complex64.go b/complex64.go
diff --git a/error.go b/error.go
diff --git a/float32.go b/float32.go
diff --git a/float64.go b/float64.go
diff --git a/int.go b/int.go
diff --git a/int16.go b/int16.go
diff --git a/int32.go b/int32.go
diff --git a/int64.go b/int64.go