diff --git a/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp b/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp index 2cb0bbd8728b1920d62936474e2c7a71cf2e7351..461f9d6b5da4e45ec76cd3807ffbea72b60543a1 100644 --- a/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp +++ b/source/RobotAPI/libraries/armem/memory/ice_conversions.cpp @@ -52,14 +52,20 @@ namespace armarx { detail::toIceItem(ice, data); - ice.data = data.data()->getResult(); + if (data.data()) + { + ice.data = data.data()->getResult(); + } toIce(ice.metadata, data.metadata()); } void armem::fromIce(const data::EntityInstance& ice, EntityInstance& data) { detail::fromIceItem(ice, data); - data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data)); + if (ice.data) + { + data.setData(aron::datanavigator::AronDataNavigator::FromAronData(ice.data)); + } fromIce(ice.metadata, data.metadata()); }