diff --git a/libtorrent/src/session_impl.cpp b/libtorrent/src/session_impl.cpp
index 7c412258..99a03c26 100644
--- a/libtorrent/src/session_impl.cpp
+++ b/libtorrent/src/session_impl.cpp
@@ -5823,8 +5823,12 @@ retry:
 
 	entry session_impl::dht_getLocalData() const
 	{
-		entry state = m_dht->state();
-		return state["storage_table"];
+		if( m_dht ) {
+			entry state = m_dht->state();
+			return state["storage_table"];
+		} else {
+			return entry();
+		}
 	}
 
 	void session_impl::on_dht_router_name_lookup(error_code const& e