diff --git a/Source/Nakatomi/EnemyCharacter.cpp b/Source/Nakatomi/EnemyCharacter.cpp
index b23e46f..9042fe5 100644
--- a/Source/Nakatomi/EnemyCharacter.cpp
+++ b/Source/Nakatomi/EnemyCharacter.cpp
@@ -142,7 +142,9 @@ void AEnemyCharacter::OnDamaged()
 {
 	Super::OnDamaged();
 
-	AEnemyAIController* controller = Cast<AEnemyAIController>(GetController());
-	controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth());
+	if (AEnemyAIController* controller = Cast<AEnemyAIController>(GetController()))
+	{
+		controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth());
+	}
 }
 
diff --git a/Source/Nakatomi/NakatomiCharacter.cpp b/Source/Nakatomi/NakatomiCharacter.cpp
index cb83a0e..6bc791a 100644
--- a/Source/Nakatomi/NakatomiCharacter.cpp
+++ b/Source/Nakatomi/NakatomiCharacter.cpp
@@ -275,12 +275,15 @@ void ANakatomiCharacter::PlayOnFireAnimations()
 
 void ANakatomiCharacter::OnDamaged()
 {
-	int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
-	
-	if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
+	if (OnDamagedHitAnimMontages.Num() > 0)
 	{
-		//TODO: Disable movement while playing animation montage
-		// PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
+		int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
+		
+		if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
+		{
+			//TODO: Disable movement while playing animation montage
+			// PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
+		}
 	}
 }