From 4c4c2533203aa2e4a9f6ba14b4480399be8ff3ca Mon Sep 17 00:00:00 2001
From: Steve Hu <stevehu@gmail.com>
Date: Mon, 30 Dec 2019 08:50:01 -0500
Subject: [PATCH] upgrade to 0.8.3 and update changelog

---
 CHANGELOG.md | 7 +++++++
 README.md    | 2 +-
 lib/utils.js | 2 +-
 package.json | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bb4f51d..807d9c9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+## 0.8.3 - 2019-12-30
+### Added
+
+### Changed
+- fixes #189 Check if obj is not null. Thanks @psamim
+
+
 ## 0.8.2 - 2019-12-24
 ### Added
 
diff --git a/README.md b/README.md
index 9d44d22c..ffda0d1b 100644
--- a/README.md
+++ b/README.md
@@ -138,4 +138,4 @@ See our [CONTRIBUTING.md](https://github.com/networknt/react-schema-form/CONTRIB
 
 # License
 
-MIT Licensed. Copyright (c) Network New Technologies Inc. 2018.
+MIT Licensed. Copyright (c) Network New Technologies Inc. 2020.
diff --git a/lib/utils.js b/lib/utils.js
index 42fba0a8..3beac4f6 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -545,7 +545,7 @@ var merge = function merge(schema, form, ignore, options, readonly) {
       };
     }
 
-    if (obj.key) {
+    if (obj && obj.key) {
       if (typeof obj.key === "string") {
         obj.key = _objectpath["default"].parse(obj.key);
       }
diff --git a/package.json b/package.json
index 1fcfd026..48bd4953 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-schema-form",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "React json schema form",
   "keywords": [
     "json schema",