diff --git a/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp b/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp
index 699ec0e730a54a3d4032f02955f804d9c392fd1a..48a02cf84612b36237e33c1ad3eddf56df1475c2 100644
--- a/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp
+++ b/source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp
@@ -65,7 +65,7 @@ namespace armarx
                 : DescribedWidgetLayoutBase(listener)
             {
                 VBoxLayoutPtr ptr = VBoxLayoutPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
                 for (const WidgetPtr& childPtr : ptr->widgets)
@@ -84,7 +84,7 @@ namespace armarx
                 : DescribedWidgetLayoutBase(listener)
             {
                 HBoxLayoutPtr ptr = HBoxLayoutPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setLayout(new QHBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
                 for (const WidgetPtr& childPtr : ptr->widgets)
@@ -102,7 +102,7 @@ namespace armarx
                 : DescribedWidgetLayoutBase(listener)
             {
                 FormLayoutPtr ptr = FormLayoutPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 auto l = new QFormLayout;
                 setLayout(l);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -121,8 +121,8 @@ namespace armarx
                 : DescribedWidgetLayoutBase(listener)
             {
                 LabeledWidgetPtr ptr = LabeledWidgetPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
                 auto l = new QHBoxLayout;
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setLayout(l);
                 layout()->setContentsMargins(0, 0, 0, 0);
                 l->addWidget(new QLabel {QString::fromStdString(ptr->label)});
@@ -170,7 +170,7 @@ namespace armarx
             DescribedLabel(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 auto ptr = LabelPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
                 layout()->addWidget(new QLabel(QString::fromStdString(ptr->text)));
@@ -189,7 +189,7 @@ namespace armarx
             DescribedVariantWidget(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 auto ptr = VariantWidgetPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 child = new armarx::VariantWidget;
@@ -231,7 +231,7 @@ namespace armarx
             DescribedCheckBox(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 CheckBoxPtr ptr = CheckBoxPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -260,7 +260,7 @@ namespace armarx
             DescribedIntSpinBox(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 IntSpinBoxPtr ptr = IntSpinBoxPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -291,7 +291,7 @@ namespace armarx
             DescribedDoubleSpinBox(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 DoubleSpinBoxPtr ptr = DoubleSpinBoxPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -324,7 +324,7 @@ namespace armarx
             DescribedFloatSpinBox(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 FloatSpinBoxPtr ptr = FloatSpinBoxPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -357,7 +357,7 @@ namespace armarx
             DescribedStringComboBox(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 StringComboBoxPtr ptr = StringComboBoxPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -390,7 +390,7 @@ namespace armarx
             DescribedLineEdit(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 LineEditPtr ptr = LineEditPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -419,7 +419,7 @@ namespace armarx
             DescribedDoubleLineEdit(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 DoubleLineEditPtr ptr = DoubleLineEditPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -449,7 +449,7 @@ namespace armarx
             DescribedFloatLineEdit(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 FloatLineEditPtr ptr = FloatLineEditPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -480,7 +480,7 @@ namespace armarx
             DescribedIntSlider(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 IntSliderPtr ptr = IntSliderPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -511,7 +511,7 @@ namespace armarx
             DescribedDoubleSlider(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 DoubleSliderPtr ptr = DoubleSliderPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QVBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);
@@ -544,7 +544,7 @@ namespace armarx
             DescribedFloatSlider(const WidgetPtr& p, ValueChangedListenerInterface*)
             {
                 FloatSliderPtr ptr = FloatSliderPtr::dynamicCast(p);
-                ARMARX_CHECK_EXPRESSION(ptr);
+                ARMARX_CHECK_NOT_NULL(ptr);
                 setName(ptr->name);
                 setLayout(new QHBoxLayout);
                 layout()->setContentsMargins(0, 0, 0, 0);