-- bug fix

rocketlaunchr · Oct 16, 2018 · dc2e2df · dc2e2df
1 parent 65a03a3
commit dc2e2df
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/structs.go b/structs.go
@@ -18,6 +18,10 @@ func SToMap(s interface{}) map[string]interface{} {
 		return nil
 	}
 
+	if jsObjectIsNil(s) {
+		return nil
+	}
+
 	// Check if s is a struct
 	if isStruct(s) {
 		return convertStruct(s)
@@ -27,6 +31,10 @@ func SToMap(s interface{}) map[string]interface{} {
 	case map[string]interface{}:
 		return x
 	default:
+		s := reflect.ValueOf(x)
+		if s.IsNil() {
+			return nil
+		}
 		panic("unrecognized type")
 	}
 }