diff --git a/Assets/Scripts/Pet/PetDamageMovement.cs b/Assets/Scripts/Pet/PetDamageMovement.cs
index 71612c4d20ff1f5fb76d8b750d2f518fa219a90d..bc4ec600e4ecf60f085b9f981bacedd982be7ac1 100644
--- a/Assets/Scripts/Pet/PetDamageMovement.cs
+++ b/Assets/Scripts/Pet/PetDamageMovement.cs
@@ -46,7 +46,7 @@ public class PetDamageMovement : MonoBehaviour
     }
 
     void Run() {
-        if(owner.tag != "Player") {
+        if(owner.tag != "Player" && player != null) {
             float distanceToPlayer = Vector3.Distance(transform.position, player.transform.position);
             if(distanceToPlayer <= runRadius) {
                 // Debug.Log("Pet Damage Running");
diff --git a/Assets/Scripts/Shop/ShopList.cs b/Assets/Scripts/Shop/ShopList.cs
index b2c9fa20d4c3542008c3c812cea2f98a8fa92303..81c32b2cca666e465b05f171be109e3b84611acc 100644
--- a/Assets/Scripts/Shop/ShopList.cs
+++ b/Assets/Scripts/Shop/ShopList.cs
@@ -64,6 +64,5 @@ public class ShopList: MonoBehaviour
             default:
                 return null;
         }
-        return null;
     }
 }
diff --git a/Assets/Scripts/Weapon/ProjectileController.cs b/Assets/Scripts/Weapon/ProjectileController.cs
index bd9c44603637ab4f18bdcf60c9f8ebd1baa11a9f..673f55c7bbc481d491649942cf8d43912dab9f5e 100644
--- a/Assets/Scripts/Weapon/ProjectileController.cs
+++ b/Assets/Scripts/Weapon/ProjectileController.cs
@@ -39,10 +39,14 @@ public class ProjectileController : MonoBehaviour
             if(isShotgunBullet) damage = damage * (2 - 0.005f*(traveledDistance * traveledDistance)); // 2-0.005x^2
             if (damage < 0) damage = 0;
             Debug.Log("Damage dealt: " + damage);
-            other.GetComponent<EnemyHealth>().TakeDamage((int)damage);
-            // audioSource.Stop();
-            // audioSource.PlayOneShot(bulletHit);
-            // audioSource.loop = false;
+
+            if (other.TryGetComponent<EnemyHealth>(out var enemyHealth))
+            {
+                enemyHealth.TakeDamage((int)damage);
+            }
+            else if (other.TryGetComponent<PetHealth>(out var petHealth)){
+                petHealth.TakeDamage((int)damage);
+            }
 
             rb.velocity = Vector3.zero;
             rb.angularVelocity = Vector3.zero;