diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/HandlerUtil.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/HandlerUtil.java
index 6f5ac1fad..f38e9d638 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/HandlerUtil.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/HandlerUtil.java
@@ -24,7 +24,7 @@ public static boolean requireField(Field<?> field, Envelope envelope) {
     }
   }
 
-  public static boolean requireNodeRecord(Envelope envelope) {
+  public static boolean requireSessionWithNodeRecord(Envelope envelope) {
     if (!requireField(Field.SESSION, envelope)) {
       return false;
     }
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/BadPacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/BadPacketHandler.java
index d937715eb..9074a3baa 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/BadPacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/BadPacketHandler.java
@@ -23,7 +23,7 @@ public void handle(Envelope envelope) {
     LOG.trace(
         () ->
             String.format(
-                "Envelope %s in BadPacketLogger, requirements are satisfied!",
+                "Envelope %s in BadPacketHandler, requirements are satisfied!",
                 envelope.getIdString()));
 
     LOG.debug(
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
index 4b8462903..c67a79c72 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/HandshakeMessagePacketHandler.java
@@ -58,7 +58,7 @@ public void handle(Envelope envelope) {
     LOG.trace(
         () ->
             String.format(
-                "Envelope %s in AuthHeaderMessagePacketHandler, requirements are satisfied!",
+                "Envelope %s in HandshakeMessagePacketHandler, requirements are satisfied!",
                 envelope.getIdString()));
 
     HandshakeMessagePacket packet = envelope.get(Field.PACKET_HANDSHAKE);
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/MessageHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/MessageHandler.java
index 1f3a220f7..9c2074d78 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/MessageHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/MessageHandler.java
@@ -40,7 +40,7 @@ public void handle(Envelope envelope) {
     if (!HandlerUtil.requireField(Field.MESSAGE, envelope)) {
       return;
     }
-    if (!HandlerUtil.requireNodeRecord(envelope)) {
+    if (!HandlerUtil.requireSessionWithNodeRecord(envelope)) {
       return;
     }
     LOG.trace(
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
index d22c2c567..041599713 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NextTaskHandler.java
@@ -47,7 +47,7 @@ public static void tryToSendAwaitTaskIfAny(
 
   @Override
   public void handle(Envelope envelope) {
-    if (!HandlerUtil.requireNodeRecord(envelope)) {
+    if (!HandlerUtil.requireSessionWithNodeRecord(envelope)) {
       return;
     }
     LOG.trace(
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
index 0c2edd613..e36a6db85 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NodeSessionManager.java
@@ -75,7 +75,7 @@ public void handle(final Envelope envelope) {
       return;
     }
     LOG.trace(
-        "Envelope {} in NodeIdToSession, requirements are satisfied!", envelope.getIdString());
+        "Envelope {} in NodeSessionManager, requirements are satisfied!", envelope.getIdString());
 
     SessionLookup sessionRequest = envelope.get(Field.SESSION_LOOKUP);
     envelope.remove(Field.SESSION_LOOKUP);
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
index b6413f6fa..576b4c691 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/PacketDispatcherHandler.java
@@ -34,7 +34,7 @@ public void handle(Envelope envelope) {
     LOG.trace(
         () ->
             String.format(
-                "Envelope %s in UnknownPacketTypeByStatus, requirements are satisfied!",
+                "Envelope %s in PacketDispatcherHandler, requirements are satisfied!",
                 envelope.getIdString()));
 
     Packet<?> packet = envelope.get(Field.PACKET);
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
index f34626503..b314639f1 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/UnauthorizedMessagePacketHandler.java
@@ -37,7 +37,7 @@ public void handle(Envelope envelope) {
     LOG.trace(
         () ->
             String.format(
-                "Envelope %s in NotExpectedIncomingPacketHandler, requirements are satisfied!",
+                "Envelope %s in UnauthorizedMessagePacketHandler, requirements are satisfied!",
                 envelope.getIdString()));
 
     NodeSession session = envelope.get(Field.SESSION);
diff --git a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
index d68c83ce7..e0cdb3066 100644
--- a/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
+++ b/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/WhoAreYouPacketHandler.java
@@ -44,12 +44,15 @@ public WhoAreYouPacketHandler(final Pipeline outgoingPipeline, final Scheduler s
 
   @Override
   public void handle(final Envelope envelope) {
-    if (!HandlerUtil.requireNodeRecord(envelope)) {
+    if (!HandlerUtil.requireSessionWithNodeRecord(envelope)) {
       return;
     }
     if (!HandlerUtil.requireField(Field.PACKET_WHOAREYOU, envelope)) {
       return;
     }
+    if (!HandlerUtil.requireField(Field.MASKING_IV, envelope)) {
+      throw new IllegalStateException("Internal error: No MASKING_IV field for WhoAreYou packet");
+    }
     LOG.trace(
         () ->
             String.format(
@@ -82,9 +85,6 @@ public void handle(final Envelope envelope) {
 
       // The handshake uses the unmasked WHOAREYOU challenge as an input:
       // challenge-data     = masking-iv || static-header || authdata
-      if (!envelope.contains(Field.MASKING_IV)) {
-        throw new IllegalStateException("Internal error: No MASKING_IV field for WhoAreYou packet");
-      }
       Bytes16 whoAreYouMaskingIV = envelope.get(Field.MASKING_IV);
       Bytes challengeData =
           Bytes.wrap(