1 files changed, 12 insertions, 7 deletions
diff --git a/Swiften/Network/HostAddressPort.cpp b/Swiften/Network/HostAddressPort.cpp
index e2e6012..248be2d 100644
--- a/Swiften/Network/HostAddressPort.cpp
+++ b/Swiften/Network/HostAddressPort.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/HostAddressPort.h>
@@ -10,14 +10,19 @@
 
 using namespace Swift;
 
-HostAddressPort::HostAddressPort(const HostAddress& address, int port) : address_(address), port_(port) {
+HostAddressPort::HostAddressPort(const HostAddress& address, unsigned short port) : address_(address), port_(port) {
 }
 
 HostAddressPort::HostAddressPort(const boost::asio::ip::tcp::endpoint& endpoint) {
-	address_ = HostAddress(endpoint.address());
-	port_ = endpoint.port();
+    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 = std::to_string(getPort());
+    } catch (boost::bad_lexical_cast&) {
+    }
+    return getAddress().toString() + ":" + portAsString;
 }