diff --git a/daemon/face/tcp-face.hpp b/daemon/face/tcp-face.hpp
index 3eddde1..e4427de 100644
--- a/daemon/face/tcp-face.hpp
+++ b/daemon/face/tcp-face.hpp
@@ -40,7 +40,6 @@
           bool isOnDemand);
 };
 
-//
 
 /**
  * \brief Implementation of Face abstraction that uses TCP
@@ -58,19 +57,19 @@
 /** \brief Class validating use of TcpLocalFace
  */
 template<>
-struct StreamFaceValidator<boost::asio::ip::tcp, LocalFace>
+struct StreamFaceValidator<TcpLocalFace::protocol, LocalFace>
 {
   /** Check that local endpoint is loopback
    *
    *  @throws Face::Error if validation failed
    */
   static void
-  validateSocket(boost::asio::ip::tcp::socket& socket)
+  validateSocket(const TcpLocalFace::protocol::socket& socket)
   {
     if (!socket.local_endpoint().address().is_loopback() ||
         !socket.remote_endpoint().address().is_loopback())
       {
-        throw Face::Error("TcpLocalFace can be created only on loopback interface");
+        throw Face::Error("TcpLocalFace can be created only on a loopback address");
       }
   }
 };