diff --git a/source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp b/source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp
index 2bc74d3ea925b041652f020b47223afe872cdeb4..ab4c6fc0955ba5c27018f5dd29d21ca06cd451c4 100644
--- a/source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp
@@ -143,8 +143,9 @@ namespace armarx::plugins
         }
 
         parent<Component>().usingProxy(_robotUnitName);
-        while (not(termCond() or not robotUnitIsRunning()))
+        while (not(termCond()) and not(robotUnitIsRunning()))
         {
+            ARMARX_INFO << deactivateSpam() << "Still waiting for robot unit to start...";
             std::this_thread::sleep_for(std::chrono::milliseconds(100));
         }
 
@@ -158,7 +159,7 @@ namespace armarx::plugins
             // An empty robotUnit can never run
             return false;
         }
-        return not(isNullptr(getRobotUnit()) or not getRobotUnit()->isRunning());
+        return not(isNullptr(getRobotUnit()) and getRobotUnit()->isRunning());
     }