2 files changed, 16 insertions, 8 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp
index 738a9fc5c4..cdeb89188b 100644
--- a/qpid/cpp/src/qpid/cluster/Cluster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp
@@ -687,11 +687,15 @@ void Cluster::initialStatus(const MemberId& member, uint32_t version, bool activ
 }
 
 void Cluster::ready(const MemberId& id, const std::string& url, Lock& l) {
-    if (map.ready(id, Url(url))) 
-        memberUpdate(l);
-    if (state == CATCHUP && id == self) {
-        setReady(l);
-        QPID_LOG(notice, *this << " caught up.");
+    try {
+        if (map.ready(id, Url(url)))
+            memberUpdate(l);
+        if (state == CATCHUP && id == self) {
+            setReady(l);
+            QPID_LOG(notice, *this << " caught up.");
+        }
+    } catch (const Url::Invalid& e) {
+        QPID_LOG(error, "Invalid URL in cluster ready command: " << url);
     }
 }
 
diff --git a/qpid/cpp/src/qpid/cluster/ClusterMap.cpp b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
index 8cac470ef3..85ed447113 100644
--- a/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
+++ b/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
@@ -137,9 +137,13 @@ ostream& operator<<(ostream& o, const ClusterMap& m) {
 }
 
 bool ClusterMap::updateRequest(const MemberId& id, const string& url) {
-    if (isAlive(id)) {
-        joiners[id] = Url(url);
-        return true;
+    try {
+        if (isAlive(id)) {
+            joiners[id] = Url(url);
+            return true;
+        }
+    } catch (const Url::Invalid&) {
+        QPID_LOG(error, "Invalid URL in cluster update request: " << url);
     }
     return false;
 }