diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp
index 0bc84b6..1a1d5af 100644
--- a/entities/data/entity_class_data.cpp
+++ b/entities/data/entity_class_data.cpp
@@ -54,7 +54,8 @@ Ref<StatData> EntityClassData::get_stat_data() {
 		return _inherits->get_stat_data();
 	}
 
-	ERR_FAIL_COND_V(!_stat_data.is_valid(), Ref<StatData>());
+	if (!_stat_data.is_valid())
+		return Ref<StatData>();
 
 	return _stat_data;
 }
diff --git a/entities/entity.cpp b/entities/entity.cpp
index 1250a83..e776a63 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -246,7 +246,9 @@ void Entity::setup() {
 void Entity::_setup() {
 	if (_s_entity_data.is_valid()) {
 		_s_entity_data->setup_resources(this);
+
 		sinitialize_stats();
+
 		sets_entity_data_id(_s_entity_data->get_id());
 
 		sets_entity_type(_s_entity_data->get_entity_type());