diff --git a/libtorrent/include/libtorrent/aux_/session_impl.hpp b/libtorrent/include/libtorrent/aux_/session_impl.hpp
index 8cfb7885..1b414b0c 100644
--- a/libtorrent/include/libtorrent/aux_/session_impl.hpp
+++ b/libtorrent/include/libtorrent/aux_/session_impl.hpp
@@ -448,7 +448,7 @@ namespace libtorrent
 #endif // TORRENT_NO_DEPRECATE
 
 #ifndef TORRENT_DISABLE_DHT
-			bool is_dht_running() const { return m_dht; }
+			bool is_dht_running() const { return m_dht.get(); }
 #endif
 
 #if TORRENT_USE_I2P
diff --git a/libtorrent/include/libtorrent/i2p_stream.hpp b/libtorrent/include/libtorrent/i2p_stream.hpp
index 1f87fa62..20e556cd 100644
--- a/libtorrent/include/libtorrent/i2p_stream.hpp
+++ b/libtorrent/include/libtorrent/i2p_stream.hpp
@@ -67,9 +67,9 @@ namespace libtorrent {
 
 struct TORRENT_EXPORT i2p_error_category : boost::system::error_category
 {
-	virtual const char* name() const;
+	virtual const char* name() const throw();
 	virtual std::string message(int ev) const;
-	virtual boost::system::error_condition default_error_condition(int ev) const
+	virtual boost::system::error_condition default_error_condition(int ev) const throw()
 	{ return boost::system::error_condition(ev, *this); }
 };
 
diff --git a/libtorrent/include/libtorrent/socks5_stream.hpp b/libtorrent/include/libtorrent/socks5_stream.hpp
index 2eca8bd7..833ffc19 100644
--- a/libtorrent/include/libtorrent/socks5_stream.hpp
+++ b/libtorrent/include/libtorrent/socks5_stream.hpp
@@ -65,9 +65,9 @@ typedef asio::error::error_category socks_error_category;
 
 struct TORRENT_EXTRA_EXPORT socks_error_category : boost::system::error_category
 {
-	virtual const char* name() const;
+	virtual const char* name() const throw();
 	virtual std::string message(int ev) const;
-	virtual boost::system::error_condition default_error_condition(int ev) const
+	virtual boost::system::error_condition default_error_condition(int ev) const throw()
 	{ return boost::system::error_condition(ev, *this); }
 };
 
diff --git a/libtorrent/include/libtorrent/torrent.hpp b/libtorrent/include/libtorrent/torrent.hpp
index d9e3a57e..1c4947e4 100644
--- a/libtorrent/include/libtorrent/torrent.hpp
+++ b/libtorrent/include/libtorrent/torrent.hpp
@@ -888,7 +888,7 @@ namespace libtorrent
 			, std::string const& private_key
 			, std::string const& dh_params
 			, std::string const& passphrase);
-		bool is_ssl_torrent() const { return m_ssl_ctx; } 
+		bool is_ssl_torrent() const { return m_ssl_ctx.get(); } 
 		boost::asio::ssl::context* ssl_ctx() const { return m_ssl_ctx.get(); } 
 #endif
 
diff --git a/libtorrent/include/libtorrent/upnp.hpp b/libtorrent/include/libtorrent/upnp.hpp
index 1f98fd1a..35b503ac 100644
--- a/libtorrent/include/libtorrent/upnp.hpp
+++ b/libtorrent/include/libtorrent/upnp.hpp
@@ -80,9 +80,9 @@ namespace libtorrent
 
 	struct TORRENT_EXPORT upnp_error_category : boost::system::error_category
 	{
-		virtual const char* name() const;
+		virtual const char* name() const throw();
 		virtual std::string message(int ev) const;
-		virtual boost::system::error_condition default_error_condition(int ev) const
+		virtual boost::system::error_condition default_error_condition(int ev) const throw()
 		{ return boost::system::error_condition(ev, *this); }
 	};
 
diff --git a/libtorrent/src/i2p_stream.cpp b/libtorrent/src/i2p_stream.cpp
index 14cf9381..c42dfd70 100644
--- a/libtorrent/src/i2p_stream.cpp
+++ b/libtorrent/src/i2p_stream.cpp
@@ -45,7 +45,7 @@ namespace libtorrent
 
 	i2p_error_category i2p_category;
 
-	const char* i2p_error_category::name() const
+	const char* i2p_error_category::name() const throw()
 	{
 		return "i2p error";
 	}
diff --git a/libtorrent/src/socks5_stream.cpp b/libtorrent/src/socks5_stream.cpp
index e53d570f..3777dcee 100644
--- a/libtorrent/src/socks5_stream.cpp
+++ b/libtorrent/src/socks5_stream.cpp
@@ -42,7 +42,7 @@ namespace libtorrent
 	socks_error_category socks_category;
 
 #if BOOST_VERSION >= 103500
-	const char* socks_error_category::name() const
+	const char* socks_error_category::name() const throw()
 	{
 		return "socks error";
 	}
diff --git a/libtorrent/src/upnp.cpp b/libtorrent/src/upnp.cpp
index 678e0ed0..80d5fafd 100644
--- a/libtorrent/src/upnp.cpp
+++ b/libtorrent/src/upnp.cpp
@@ -1099,7 +1099,7 @@ namespace
 #if BOOST_VERSION >= 103500
 
 
-const char* upnp_error_category::name() const
+const char* upnp_error_category::name() const throw()
 {
 	return "UPnP error";
 }