diff --git a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
index cfa6f00629a5d027130a5f0cb76bb8a488a49e09..6cd0272217df2826bb5b32f0c0b17ac3085e560e 100644
--- a/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
@@ -489,11 +489,8 @@ namespace armarx
 
     bool RemoteRobot::synchronizeLocalCloneToTimestamp(RobotPtr robot, RobotStateComponentInterfacePrx robotStatePrx, Ice::Long timestamp)
     {
-        if (!robotStatePrx || !robot)
-        {
-            ARMARX_ERROR_S << "NULL data. Aborting..." << endl;
-            return false;
-        }
+        ARMARX_CHECK_EXPRESSION(robotStatePrx);
+        ARMARX_CHECK_EXPRESSION(robot);
 
         RobotConfigPtr c(new RobotConfig(robot, "synchronizeLocalClone"));
         RobotStateConfig config = robotStatePrx->getRobotStateAtTimestamp(timestamp);