1 files changed, 6 insertions, 1 deletions
diff --git a/Swiften/Network/HostAddressPort.cpp b/Swiften/Network/HostAddressPort.cpp
index a73b2ad..76c276e 100644
--- a/Swiften/Network/HostAddressPort.cpp
+++ b/Swiften/Network/HostAddressPort.cpp
@@ -1,23 +1,28 @@
 /*
  * Copyright (c) 2010 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/HostAddressPort.h>
 
 #include <boost/lexical_cast.hpp>
 
 using namespace Swift;
 
 HostAddressPort::HostAddressPort(const HostAddress& address, int port) : address_(address), port_(port) {
 }
 
 HostAddressPort::HostAddressPort(const boost::asio::ip::tcp::endpoint& endpoint) {
     address_ = HostAddress(endpoint.address());
     port_ = endpoint.port();
 }
 
 std::string HostAddressPort::toString() const {
-    return getAddress().toString() + ":" + boost::lexical_cast<std::string>(getPort());
+    std::string portAsString;
+    try {
+        portAsString = boost::lexical_cast<std::string>(getPort());
+    } catch (boost::bad_lexical_cast&) {
+    }
+    return getAddress().toString() + ":" + portAsString;
 }