From c8a9f456975b4435adf287c76a1a86e56ca7aaa0 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 12 Feb 2016 14:11:50 +0100
Subject: [PATCH] ApiListener: Bail out if object could not be created during
 config sync

refs #11006
---
 lib/remote/apilistener-configsync.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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