1 files changed, 17 insertions, 5 deletions
diff --git a/Swiften/LinkLocal/LinkLocalServiceBrowser.cpp b/Swiften/LinkLocal/LinkLocalServiceBrowser.cpp
index b3328cd..0498384 100644
--- a/Swiften/LinkLocal/LinkLocalServiceBrowser.cpp
+++ b/Swiften/LinkLocal/LinkLocalServiceBrowser.cpp
@@ -67,15 +67,27 @@ bool LinkLocalServiceBrowser::isRegistered() const {
 void LinkLocalServiceBrowser::registerService(const std::string& name, unsigned short port, const LinkLocalServiceInfo& info) {
    assert(!registerQuery);
-    registerQuery = querier->createRegisterQuery(name, port, info.toTXTRecord());
+    if (auto txtRecord = info.toTXTRecord()) {
-    registerQuery->onRegisterFinished.connect(
+        registerQuery = querier->createRegisterQuery(name, port, *txtRecord);
-        boost::bind(&LinkLocalServiceBrowser::handleRegisterFinished, this, _1));
+        registerQuery->onRegisterFinished.connect(
-    registerQuery->registerService();
+            boost::bind(&LinkLocalServiceBrowser::handleRegisterFinished, this, _1));
+        registerQuery->registerService();
+    }
+    else {
+        haveError = true;
+        stop();
+    }
 }
 void LinkLocalServiceBrowser::updateService(const LinkLocalServiceInfo& info) {
    assert(registerQuery);
-    registerQuery->updateServiceInfo(info.toTXTRecord());
+    if (auto txtRecord = info.toTXTRecord()) {
+        registerQuery->updateServiceInfo(*txtRecord);
+    }
+    else {
+        haveError = true;
+        stop();
+    }
 }
 void LinkLocalServiceBrowser::unregisterService() {