From 2f948ca8ca36b163a2718a1ad2f809c9eb5cb166 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 9 Feb 2016 09:13:43 +0100
Subject: [PATCH] Fix crash in ApiListener::ConfigUpdateObjectAPIHandler

fixes #11006
---
 lib/remote/apilistener-configsync.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/remote/apilistener-configsync.cpp b/lib/remote/apilistener-configsync.cpp
index 89d154be7..970ea4c75 100644
--- a/lib/remote/apilistener-configsync.cpp
+++ b/lib/remote/apilistener-configsync.cpp
@@ -128,9 +128,11 @@ Value ApiListener::ConfigUpdateObjectAPIHandler(const MessageOrigin::Ptr& origin
 			return Empty;
 		}
 
-		/* object was created, update its version to its origin */
+		/* object was created, update its version */
 		object = dtype->GetObject(objName);
-		object->SetVersion(objVersion, false, origin);
+
+		if (object)
+			object->SetVersion(objVersion, false, origin);
 	}
 
 	if (!object)