diff --git a/NetDb.cpp b/NetDb.cpp
index b0c95482..cf1d6382 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -347,7 +347,7 @@ namespace data
 							// do we have that floodfill router in our database?
 							if (r)
 							{
-								if (!dest->IsExcluded (r->GetIdentHash ()) && dest->GetNumExcludedPeers () < 10) // TODO: fix TunnelGateway first
+								if (!dest->IsExcluded (r->GetIdentHash ()) && dest->GetNumExcludedPeers () < 30) // TODO: fix TunnelGateway first
 								{	
 									// request destination
 									auto msg = dest->CreateRequestMessage (r, dest->GetLastReplyTunnel ());
diff --git a/Transports.cpp b/Transports.cpp
index e9953eca..371ea2e6 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -142,7 +142,14 @@ namespace i2p
 					session = new i2p::ntcp::NTCPClient (m_Service, address->host.c_str (), address->port, *r);
 					AddNTCPSession (session);
 				}	
+				else
+					LogPrint ("No NTCP addresses available");
 			}
+			else
+			{
+				LogPrint ("Router not found. Requested");
+				i2p::data::netdb.RequestDestination (ident);
+			}	
 		}	
 		if (session)
 			session->SendI2NPMessage (msg);