diff --git a/cpp/buses/bus.cpp b/cpp/buses/bus.cpp
index 28b92510..ff4807de 100644
--- a/cpp/buses/bus.cpp
+++ b/cpp/buses/bus.cpp
@@ -103,12 +103,7 @@ int Bus::MsgInHandShake()
 {
     const BusPhase phase = GetPhase();
 
-    if (!WaitSignal(PIN_REQ, true)) {
-        return -1;
-    }
-
-    // Phase error
-    if (GetPhase() != phase) {
+    if (!WaitSignal(PIN_REQ, true) || GetPhase() != phase) {
         return -1;
     }
 
@@ -162,12 +157,7 @@ int Bus::ReceiveHandShake(uint8_t *buf, int count)
         const BusPhase phase = GetPhase();
 
         for (bytes_received = 0; bytes_received < count; ++bytes_received) {
-            if (!WaitSignal(PIN_REQ, true)) {
-                break;
-            }
-
-            // Phase error
-            if (GetPhase() != phase) {
+            if (!WaitSignal(PIN_REQ, true) || GetPhase() != phase) {
                 break;
             }