diff --git a/src/KKdLib/pvpp.cpp b/src/KKdLib/pvpp.cpp
index ea094d16..ec6f121a 100644
--- a/src/KKdLib/pvpp.cpp
+++ b/src/KKdLib/pvpp.cpp
@@ -55,14 +55,6 @@ pvpp_chara_item::~pvpp_chara_item() {
 
 }
 
-pvpp_effect::pvpp_effect() : chara_id() {
-
-}
-
-pvpp_effect::~pvpp_effect() {
-
-}
-
 pvpp_glitter::pvpp_glitter() : unk2() {
 
 }
@@ -71,6 +63,14 @@ pvpp_glitter::~pvpp_glitter() {
 
 }
 
+pvpp_effect::pvpp_effect() : chara_id() {
+
+}
+
+pvpp_effect::~pvpp_effect() {
+
+}
+
 pvpp::pvpp() : ready(), big_endian() {
 
 }
diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp
index 4dd8c062..2241bfde 100644
--- a/src/ReDIVA/x_pv_game.cpp
+++ b/src/ReDIVA/x_pv_game.cpp
@@ -1117,7 +1117,7 @@ void x_pv_game_effect::set_song_effect(int32_t index, int64_t time) {
     size_t chara_count = play_param->chara.size();
 
     int32_t chara_id = play_param->effect[index].chara_id;
-    if (chara_id < 0 && chara_id >= ROB_CHARA_COUNT)
+    if (chara_id < 0 || chara_id >= ROB_CHARA_COUNT || chara_id >= chara_count)
         chara_id = -1;
     song_effect.chara_id = chara_id;
 
@@ -1434,6 +1434,8 @@ void x_pv_game_chara_effect::load(int32_t pv_id, pvpp* play_param,
     size_t chara_count = play_param->chara.size();
     for (int32_t i = 0; i < chara_count && i < ROB_CHARA_COUNT; i++) {
         pvpp_chara& chara = play_param->chara[i];
+        if (!chara.chara_effect_init)
+            continue;
 
         pvpp_chara_effect& chara_effect = chara.chara_effect;