diff --git a/libtorrent/include/libtorrent/bandwidth_manager.hpp b/libtorrent/include/libtorrent/bandwidth_manager.hpp
index 19f0cc790..148f68d43 100644
--- a/libtorrent/include/libtorrent/bandwidth_manager.hpp
+++ b/libtorrent/include/libtorrent/bandwidth_manager.hpp
@@ -230,6 +230,8 @@ private:
 
 		mutex_t::scoped_lock l(m_mutex);
 		INVARIANT_CHECK;
+		if (m_abort) return;
+
 		TORRENT_ASSERT(!m_history.empty());
 
 		ptime now(time_now());
diff --git a/libtorrent/src/session_impl.cpp b/libtorrent/src/session_impl.cpp
index 80e7ee7bc..af871d6bf 100755
--- a/libtorrent/src/session_impl.cpp
+++ b/libtorrent/src/session_impl.cpp
@@ -1028,7 +1028,7 @@ namespace detail
 			if (m_alerts.should_post(alert::fatal))
 			{
 				std::string msg = "error accepting connection on '"
-					+ boost::lexical_cast<std::string>(ep) + "' " + ec.message();
+					+ boost::lexical_cast<std::string>(ep) + "' " + e.message();
 				m_alerts.post_alert(listen_failed_alert(ep, msg));
 			}
 			return;