6 files changed, 21 insertions, 9 deletions
diff --git a/src/checker/errors/mail/at_sign.cpp b/src/checker/errors/mail/at_sign.cpp
index f9dde08..0acb470 100644
--- a/src/checker/errors/mail/at_sign.cpp
+++ b/src/checker/errors/mail/at_sign.cpp
@@ -3,13 +3,14 @@
 #include "at_sign.hpp"
 #include "logger/logger_set.hpp"
 
-namespace smtp::checker::errors::settings
+namespace smtp::checker::errors::mail
 {
     bool AtSign::Check( std::string const& line ) const
     {
         std::string mask = R"([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4}))";
+
         auto result = std::regex_search( line, std::regex{mask} );
-        if(!result)
+        if( !result )
         {
             logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Error in mail note" );
         }
diff --git a/src/checker/errors/mail/at_sign.hpp b/src/checker/errors/mail/at_sign.hpp
index 2f72871..38a7d96 100644
--- a/src/checker/errors/mail/at_sign.hpp
+++ b/src/checker/errors/mail/at_sign.hpp
@@ -2,7 +2,7 @@
 
 #include "checker/errors/types/imails_error.hpp"
 
-namespace smtp::checker::errors::settings
+namespace smtp::checker::errors::mail
 {
     class AtSign : public types::IErrorMails
     {
diff --git a/src/checker/errors/mail/empty.cpp b/src/checker/errors/mail/empty.cpp
index 1c39e78..8a1591e 100644
--- a/src/checker/errors/mail/empty.cpp
+++ b/src/checker/errors/mail/empty.cpp
@@ -1,12 +1,12 @@
 #include "empty.hpp"
 #include "logger/logger_set.hpp"
 
-namespace smtp::checker::errors::settings
+namespace smtp::checker::errors::mail
 {
     bool Empty::Check( std::string const& line ) const
     {
         auto result = !line.empty() && line != " ";
-        if(!result)
+        if( !result )
         {
             logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Mails are empty" );
         }
diff --git a/src/checker/errors/mail/empty.hpp b/src/checker/errors/mail/empty.hpp
index 945650e..880f5c1 100644
--- a/src/checker/errors/mail/empty.hpp
+++ b/src/checker/errors/mail/empty.hpp
@@ -2,7 +2,7 @@
 
 #include "checker/errors/types/imails_error.hpp"
 
-namespace smtp::checker::errors::settings
+namespace smtp::checker::errors::mail
 {
     class Empty : public types::IErrorMails
     {
diff --git a/src/checker/errors/settings/port_number.cpp b/src/checker/errors/settings/port_number.cpp
index 485b4c7..b0d9661 100644
--- a/src/checker/errors/settings/port_number.cpp
+++ b/src/checker/errors/settings/port_number.cpp
@@ -5,7 +5,7 @@
 
 namespace smtp::checker::errors::settings
 {
-	bool PortNumber::Check( const manage::SettingsFileDataType& line ) const
+    bool PortNumber::Check( manage::SettingsFileDataType const& line ) const
 	{
 		static const std::string PORT_FIELD = "port";
 		static constexpr int MIN_PORT_NUMBER = 0;
@@ -23,6 +23,7 @@ namespace smtp::checker::errors::settings
 		{
 			return true;
 		}
+
 		int host_as_int{};
 		try
 		{
@@ -43,6 +44,11 @@ namespace smtp::checker::errors::settings
             logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" );
 			return false;
 		}
-		return host_as_int >= MIN_PORT_NUMBER && host_as_int <= MAX_PORT_NUMBER;
+        auto result = host_as_int >= MIN_PORT_NUMBER && host_as_int <= MAX_PORT_NUMBER;
+        if( !result )
+        {
+            logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Port doesn't entered by numbers" );
+        }
+        return result;
 	}
 }
diff --git a/src/checker/errors/settings/server.cpp b/src/checker/errors/settings/server.cpp
index c3f29af..d25bc9a 100644
--- a/src/checker/errors/settings/server.cpp
+++ b/src/checker/errors/settings/server.cpp
@@ -18,7 +18,12 @@ namespace smtp::checker::errors::settings
             logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Host doesn't found" );
             return false;
         }
-        return IsNormalName( find->second ) || IsIpName( find->second );
+        auto result = IsNormalName( find->second ) || IsIpName( find->second );
+        if( !result )
+        {
+            logger::LoggerSet::GetInstance()->LogError( GetMethodName(), "Host set incorrectly" );
+        }
+        return result;
     }
 
     //