diff --git a/korman/idprops.py b/korman/idprops.py
index b7c55a6..40cc474 100644
--- a/korman/idprops.py
+++ b/korman/idprops.py
@@ -119,10 +119,7 @@ class IDPropObjectMixin(IDPropMixin):
 
 
 def poll_animated_objects(self, value):
-    if value.animation_data is not None:
-        if value.animation_data.action is not None:
-            return True
-    return False
+    return value.plasma_object.has_animation_data
 
 def poll_camera_objects(self, value):
     return value.type == "CAMERA"
diff --git a/korman/properties/modifiers/anim.py b/korman/properties/modifiers/anim.py
index c836df4..fba352a 100644
--- a/korman/properties/modifiers/anim.py
+++ b/korman/properties/modifiers/anim.py
@@ -193,7 +193,7 @@ class PlasmaAnimationGroupModifier(ActionModifier, PlasmaModifierProperties):
                 msg = "Animation Group '{}' specifies an invalid object. Ignoring..."
                 exporter.report.warn(msg, self.key_name, ident=2)
                 continue
-            if child_bo.animation_data is None or child_bo.animation_data.action is None:
+            if not child_bo.plasma_object.has_animation_data:
                 msg = "Animation Group '{}' specifies an object '{}' with no valid animation data. Ignoring..."
                 exporter.report.warn(msg, self.key_name, child_bo.name, indent=2)
                 continue