diff --git a/source/RobotAPI/components/ArViz/Client/Client.cpp b/source/RobotAPI/components/ArViz/Client/Client.cpp
index 268da627405450db9c12ac2dcba4871fff505f7b..36cfb2263b177ff13008b078eea0ac6b44b17764 100644
--- a/source/RobotAPI/components/ArViz/Client/Client.cpp
+++ b/source/RobotAPI/components/ArViz/Client/Client.cpp
@@ -28,6 +28,7 @@ Client::Client(ManagedIceObject& obj,
                std::string const& storageName)
 {
     componentName = obj.getName();
+    ARMARX_CHECK_NOT_EMPTY(componentName);
     obj.getTopic(topic, topicName);
     obj.getProxy(storage, storageName);
 }
@@ -35,6 +36,7 @@ Client::Client(ManagedIceObject& obj,
 Client Client::createFromTopic(std::string const& componentName, Topic::ProxyType const& topic)
 {
     Client client;
+    ARMARX_CHECK_NOT_EMPTY(componentName);
     client.componentName = componentName;
     client.topic = topic;
     return client;
diff --git a/source/RobotAPI/components/ArViz/Client/Client.h b/source/RobotAPI/components/ArViz/Client/Client.h
index d05dc398064559ecdbb8c9610afd520419494f5d..a0b9c3944d982366dfc5dc503421a3a34f841d27 100644
--- a/source/RobotAPI/components/ArViz/Client/Client.h
+++ b/source/RobotAPI/components/ArViz/Client/Client.h
@@ -132,6 +132,8 @@ namespace viz
 
         Layer layer(std::string const& name) const
         {
+            ARMARX_CHECK_NOT_EMPTY(componentName);
+            ARMARX_CHECK_NOT_EMPTY(name);
             return Layer(componentName, name);
         }