diff --git a/AddressBook.cpp b/AddressBook.cpp
index f778fff6..e996b5f0 100644
--- a/AddressBook.cpp
+++ b/AddressBook.cpp
@@ -658,23 +658,17 @@ namespace client
 		if (!leaseSet)
 		{
 			std::unique_lock<std::mutex> l(newDataReceivedMutex);
-			if (i2p::client::context.GetSharedLocalDestination ()->RequestDestination (m_Ident,
-				[&newDataReceived, &leaseSet](std::shared_ptr<i2p::data::LeaseSet> ls)
+			i2p::client::context.GetSharedLocalDestination ()->RequestDestination (m_Ident,
+				[&newDataReceived, &leaseSet, &newDataReceivedMutex](std::shared_ptr<i2p::data::LeaseSet> ls)
 			    {
 					leaseSet = ls;
+					std::unique_lock<std::mutex> l1(newDataReceivedMutex);
 					newDataReceived.notify_all ();
-				}))
-			{
-				if (newDataReceived.wait_for (l, std::chrono::seconds (SUBSCRIPTION_REQUEST_TIMEOUT)) == std::cv_status::timeout)
-				{
-					LogPrint (eLogError, "Addressbook: Subscription LeaseSet request timeout expired");
-					i2p::client::context.GetSharedLocalDestination ()->CancelDestinationRequest (m_Ident, false); // don't notify, because we know it already
-					return false;
-				}
-			}
-			else
+				});
+			if (newDataReceived.wait_for (l, std::chrono::seconds (SUBSCRIPTION_REQUEST_TIMEOUT)) == std::cv_status::timeout)
 			{
-				LogPrint (eLogError, "Addressbook: Destination is not ready");
+				LogPrint (eLogError, "Addressbook: Subscription LeaseSet request timeout expired");
+				i2p::client::context.GetSharedLocalDestination ()->CancelDestinationRequest (m_Ident, false); // don't notify, because we know it already
 				return false;
 			}
 		}
diff --git a/Destination.cpp b/Destination.cpp
index 05216d18..42351787 100644
--- a/Destination.cpp
+++ b/Destination.cpp
@@ -479,7 +479,8 @@ namespace client
 	{
 		if (!m_Pool || !IsReady ()) 
 		{	
-			if (requestComplete) requestComplete (nullptr);
+			if (requestComplete) 
+				m_Service.post ([requestComplete](void){requestComplete (nullptr);});
 			return false;
 		}	
 		m_Service.post (std::bind (&LeaseSetDestination::RequestLeaseSet, shared_from_this (), dest, requestComplete));