diff --git a/ChangeLog b/ChangeLog
index 6ad33cd93..f655d9e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
 	* almost completely changed the storage interface (for custom storage)
 	* added support for hashing pieces in multiple threads
 
+	* anonymous_mode defaults to false
 	* make DHT DOS detection more forgiving to bursts
 	* support IPv6 multicast in local service discovery
 	* simplify CAS function in DHT put
diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp
index 87febf2eb..9678498e6 100644
--- a/bindings/python/src/session.cpp
+++ b/bindings/python/src/session.cpp
@@ -36,7 +36,9 @@ namespace
         allow_threading_guard guard;
         error_code ec;
         s.listen_on(std::make_pair(min_, max_), ec, interface, flags);
+#ifndef BOOST_NO_EXCEPTIONS
         if (ec) throw libtorrent_exception(ec);
+#endif
     }
 #endif
 
diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp
index 3aa88fd6a..4bda7356a 100644
--- a/src/settings_pack.cpp
+++ b/src/settings_pack.cpp
@@ -171,7 +171,7 @@ namespace libtorrent
 		SET(enable_incoming_tcp, true, 0),
 		SET(ignore_resume_timestamps, false, 0),
 		SET(no_recheck_incomplete_resume, false, 0),
-		SET(anonymous_mode, true, &session_impl::update_anonymous_mode),
+		SET(anonymous_mode, false, &session_impl::update_anonymous_mode),
 		SET(report_web_seed_downloads, true, &session_impl::update_report_web_seed_downloads),
 		SET(utp_dynamic_sock_buf, true, 0),
 		DEPRECATED_SET(rate_limit_utp, false, &session_impl::update_rate_limit_utp),