diff --git a/source/RobotAPI/components/SkillObserver/SkillObserver.h b/source/RobotAPI/components/SkillObserver/SkillObserver.h
index 44afdb0070538c416d06d2a938eef09d6d54693b..b3b0e4243429919a8805b55188edfabadb724a45 100644
--- a/source/RobotAPI/components/SkillObserver/SkillObserver.h
+++ b/source/RobotAPI/components/SkillObserver/SkillObserver.h
@@ -23,6 +23,10 @@
 #pragma once
 
 #include <thread>
+#include <string>
+#include <vector>
+#include <mutex>
+#include <map>
 
 #include <ArmarXCore/core/Component.h>
 
diff --git a/source/RobotAPI/libraries/armem/util/util.h b/source/RobotAPI/libraries/armem/util/util.h
index f160efcd49b3f3ddc3ec93aa98b07e5ff80c8dc6..35fc1538b78df0b817e7ae0676be68e9675d1f0f 100644
--- a/source/RobotAPI/libraries/armem/util/util.h
+++ b/source/RobotAPI/libraries/armem/util/util.h
@@ -46,6 +46,17 @@ namespace armarx::armem
         static_assert(std::is_base_of<armarx::aron::cppserializer::AronCppClass,
                       AronClass>::value);
 
+
+        if (!item.data())
+        {
+            return std::nullopt;
+        }
+
+        if (item.data()->getDescriptor() != aron::data::Descriptor::eDict)
+        {
+            return std::nullopt;
+        }
+
         try
         {
             AronClass t;