diff --git a/libi2pd_client/I2PTunnel.cpp b/libi2pd_client/I2PTunnel.cpp
index 23a3ad52..d1006f26 100644
--- a/libi2pd_client/I2PTunnel.cpp
+++ b/libi2pd_client/I2PTunnel.cpp
@@ -397,7 +397,8 @@ namespace client
 			while (!endOfHeader)
 			{
 				std::getline(m_InHeader, line);
-				if (!m_InHeader.fail ())
+				if (m_InHeader.fail ()) break;
+				if (!m_InHeader.eof ())
 				{
 					if (line == "\r") endOfHeader = true;
 					else
@@ -485,7 +486,8 @@ namespace client
 			while (!endOfHeader)
 			{
 				std::getline(m_InHeader, line);
-				if (!m_InHeader.fail ())
+				if (m_InHeader.fail ()) break;
+				if (!m_InHeader.eof ())
 				{
 					if (line == "\r") endOfHeader = true;
 					else