Made get_atomic_entity_value more robust