1 files changed, 5 insertions, 2 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
index 02564a113a..12678696cc 100644
--- a/src/qmlmodels/qqmldelegatemodel.cpp
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
@@ -946,15 +946,18 @@ void PropertyUpdater::breakBinding()
         return;
     if (updateCount == 0) {
         QObject::disconnect(*it);
+        senderToConnection.erase(it);
         QQmlError warning;
-        warning.setUrl(qmlContext(QObject::sender())->baseUrl());
+        if (auto context = qmlContext(QObject::sender()))
+            warning.setUrl(context->baseUrl());
+        else
+            return;
         auto signalName = QString::fromLatin1(QObject::sender()->metaObject()->method(QObject::senderSignalIndex()).name());
         signalName.chop(sizeof("changed")-1);
         QString propName = signalName;
         propName[0] = propName[0].toLower();
         warning.setDescription(QString::fromUtf8("Writing to \"%1\" broke the binding to the underlying model").arg(propName));
         qmlWarning(this, warning);
-        senderToConnection.erase(it);
     } else {
         --updateCount;
     }