diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index fbfa7249..1efd7733 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -644,9 +644,6 @@ CCopPed::ProcessControl(void)
 				int numCopsNear = 0;
 				for (int i = 0; i < player->m_numNearPeds; ++i) {
 					CPed *nearPed = player->m_nearPeds[i];
-#ifdef FIX_BUGS
-					if (nearPed)
-#endif
 					if (nearPed->m_nPedType == PEDTYPE_COP && nearPed->m_nPedState != PED_DEAD)
 						++numCopsNear;
 				}
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index e07b5dd4..96f3479c 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -403,6 +403,30 @@ CPed::~CPed(void)
 		CPopulation::NumMiamiViceCops--;
 	CPopulation::UpdatePedCount((ePedType)m_nPedType, true);
 	DMAudio.DestroyEntity(m_audioEntityId);
+
+	// Because of the nature of ped lists in GTA, it can sometimes be outdated.
+	// Remove ourself from nearPeds list of the Peds in our nearPeds list.
+#ifdef FIX_BUGS
+	for(int i = 0; i < m_numNearPeds; i++) {
+		CPed *nearPed = m_nearPeds[i];
+		assert(nearPed != nil);
+		if (!nearPed->IsPointerValid())
+			continue;
+
+		for(int j = 0; j < nearPed->m_numNearPeds;) {
+			assert(j == ARRAY_SIZE(m_nearPeds) - 1 || nearPed->m_nearPeds[j] || !nearPed->m_nearPeds[j+1]); // ensure nil comes after nil
+
+			if (nearPed->m_nearPeds[j] == this) {
+				for (int k = j; k < ARRAY_SIZE(m_nearPeds) - 1; k++) {
+					nearPed->m_nearPeds[k] = nearPed->m_nearPeds[k + 1];
+					nearPed->m_nearPeds[k + 1] = nil;
+				}
+				nearPed->m_numNearPeds--;
+			} else
+				j++;
+		}
+	}
+#endif
 }
 
 void
@@ -519,13 +543,15 @@ CPed::BuildPedLists(void)
 				removePed = true;
 			}
 		}
+
+		assert(i == ARRAY_SIZE(m_nearPeds) - 1 || m_nearPeds[i] || !m_nearPeds[i+1]); // ensure nil comes after nil
+
 		if (removePed) {
 			// If we arrive here, the ped we're checking isn't "near", so we should remove it.
 			for (int j = i; j < ARRAY_SIZE(m_nearPeds) - 1; j++) {
 				m_nearPeds[j] = m_nearPeds[j + 1];
 				m_nearPeds[j + 1] = nil;
 			}
-			// Above loop won't work on last slot, so we need to empty it.
 			m_nearPeds[ARRAY_SIZE(m_nearPeds) - 1] = nil;
 			m_numNearPeds--;
 		} else
diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index 6730d731..cf2e4ed5 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -17,9 +17,9 @@ const RwV3d XaxisIK = { 1.0f, 0.0f, 0.0f};
 const RwV3d YaxisIK = { 0.0f, 1.0f, 0.0f};
 const RwV3d ZaxisIK = { 0.0f, 0.0f, 1.0f};
 
-CPedIK::CPedIK(CPed *ped)
+CPedIK::CPedIK(CPed *ped) : m_ped(ped)
 {
-	m_ped = ped;
+	assert(ped != nil);
 	m_flags = 0;
 	m_headOrient.yaw = 0.0f;
 	m_headOrient.pitch = 0.0f;
diff --git a/src/peds/PedIK.h b/src/peds/PedIK.h
index ee719fea..8be04365 100644
--- a/src/peds/PedIK.h
+++ b/src/peds/PedIK.h
@@ -34,7 +34,7 @@ public:
 		AIMS_WITH_ARM = 4,
 	};
 
-	CPed *m_ped;
+	CPed *Const m_ped;
 	LimbOrientation m_headOrient;
 	LimbOrientation m_torsoOrient;
 	LimbOrientation m_upperArmOrient;