diff --git a/gamemodes/irresistible/cnr/features/cop/arrest.pwn b/gamemodes/irresistible/cnr/features/cop/arrest.pwn
index 913aeac..43bdeff 100644
--- a/gamemodes/irresistible/cnr/features/cop/arrest.pwn
+++ b/gamemodes/irresistible/cnr/features/cop/arrest.pwn
@@ -493,7 +493,7 @@ function BreakPlayerCuffsAttempt( playerid ) return BreakPlayerCuffs( playerid )
 
 stock AwardNearestLEO( playerid, reason )
 {
-	if ( ! IsPlayerConnected( playerid ) || playerid == INVALID_PLAYER_ID )
+	if ( ! IsPlayerConnected( playerid ) || playerid == INVALID_PLAYER_ID || GetPlayerWantedLevel( playerid ) < 2 )
 		return false;
 
 	new
diff --git a/gamemodes/irresistible/cnr/features/weapon_drop.pwn b/gamemodes/irresistible/cnr/features/weapon_drop.pwn
index 6ae8f4f..a8b0968 100644
--- a/gamemodes/irresistible/cnr/features/weapon_drop.pwn
+++ b/gamemodes/irresistible/cnr/features/weapon_drop.pwn
@@ -432,7 +432,7 @@ stock RemoveSpecificPlayerWeapon( playerid, weaponid, bool:createpickup )
 			    GetPlayerWeaponData( playerid, iSlot, iWeaponID[ iSlot ], iWeaponAmmo[ iSlot ] );
 			}
 			
-			if ( createpickup )
+			if ( createpickup && iCurrentWeapon == iWeapon )
 			{
 				new
 					Float: X, Float: Y, Float: Z;