diff --git a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
index 3193f29cc83..0d73810c415 100644
--- a/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
@@ -744,6 +744,8 @@ QObject *createComponent(const QString &componentPath, QDeclarativeContext *cont
     tweakObjects(object);
     component.completeCreate();
 
+    Q_ASSERT(QDeclarativeEngine::contextForObject(object));
+
     return object;
 }
 
@@ -768,6 +770,8 @@ QObject *createPrimitive(const QString &typeName, int majorNumber, int minorNumb
     if (object && context)
         QDeclarativeEngine::setContextForObject(object, context);
 
+    Q_ASSERT(QDeclarativeEngine::contextForObject(object));
+
     return object;
 }
 
diff --git a/src/tools/qmlpuppet/main.cpp b/src/tools/qmlpuppet/main.cpp
index 74dd5c9fe01..90cee644c3d 100644
--- a/src/tools/qmlpuppet/main.cpp
+++ b/src/tools/qmlpuppet/main.cpp
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("Nokia");
     QCoreApplication::setOrganizationDomain("nokia.com");
     QCoreApplication::setApplicationName("QmlPuppet");
+    QCoreApplication::setApplicationVersion("1.0.0");
 
 #ifdef ENABLE_QT_BREAKPAD
     QtSystemExceptionHandler systemExceptionHandler;