Index: code/object/object.cpp
===================================================================
--- code/object/object.cpp	(revision 9697)
+++ code/object/object.cpp	(working copy)
@@ -393,6 +393,8 @@
 	if (!Object_inited) obj_init();
 
 	Assert( objnum >= 0 );	// Trying to free bogus object!!!
+    
+    mprintf(("obj_free() called on Objects[%i]\n", objnum));
 
 	// get object pointer
 	objp = &Objects[objnum];
@@ -520,6 +522,11 @@
 		return;
 	};	
 
+    mprintf(("obj_delete() called on Objects[%i] of type %s\n", objnum, Object_type_names[objp->type]));
+    if (objp->type == OBJ_WEAPON) {
+        mprintf(("  Objects[%i]: Weapon name = %s\n", objnum, Weapon_info[Weapons[objp->instance].weapon_info_index].name));
+    }
+    
 	// Remove all object pairs
 	if ( Cmdline_old_collision_sys ) {
 		obj_remove_pairs( objp );
@@ -598,7 +605,7 @@
 
 	// if a persistant sound has been created, delete it
 	obj_snd_delete_type(OBJ_INDEX(objp));		
-
+    
 	objp->type = OBJ_NONE;		//unused!
 	objp->signature = 0;		
 
Index: code/ai/aicode.cpp
===================================================================
--- code/ai/aicode.cpp	(revision 9697)
+++ code/ai/aicode.cpp	(working copy)
@@ -9151,6 +9151,7 @@
 	ai_info	*attacking_aip;
 	ship_obj	*so;
 	int		count = 0;
+    mprintf(("Target object is Objects[%i]\n", target_objnum));
 	int target_team = obj_team(&Objects[target_objnum]);
 
 	for ( so = GET_FIRST(&Ship_obj_list); so != END_OF_LIST(&Ship_obj_list); so = GET_NEXT(so) )

Index: code/weapon/weapons.cpp
===================================================================
--- code/weapon/weapons.cpp	(revision 9735)
+++ code/weapon/weapons.cpp	(working copy)
@@ -5865,8 +5865,13 @@
 	int			weapon_type = Weapons[num].weapon_info_index;
 	int			expl_ani_handle;
 	weapon_info	*wip;
-	weapon *wp;
+	weapon      *wp;
 	bool		hit_target = false;
+    
+	object      *other_objp;
+	ship_obj	*so;
+	ship		*shipp;
+	int         objnum;
 
 	Assert((weapon_type >= 0) && (weapon_type < MAX_WEAPONS));
 	if((weapon_type < 0) || (weapon_type >= MAX_WEAPONS)){
@@ -5874,6 +5879,7 @@
 	}
 	wp = &Weapons[weapon_obj->instance];
 	wip = &Weapon_info[weapon_type];
+	objnum = wp->objnum;
 
 	// check if the weapon actually hit the intended target
 	if (wp->homing_object != NULL)
@@ -5882,7 +5888,6 @@
 
 	//This is an expensive check
 	bool armed_weapon = weapon_armed(&Weapons[num], hit_target);
-	// int np_index;
 
 	// if this is the player ship, and is a laser hit, skip it. wait for player "pain" to take care of it
 	if ((other_obj != Player_obj) || (wip->subtype != WP_LASER) || !MULTIPLAYER_CLIENT) {
@@ -5962,6 +5967,37 @@
 			}
 		}
 	}
+    
+	// For all objects that had this weapon as a target, wipe it out, forcing find of a new enemy
+	for ( so = GET_FIRST(&Ship_obj_list); so != END_OF_LIST(&Ship_obj_list); so = GET_NEXT(so) ) {
+		other_objp = &Objects[so->objnum];
+		Assert(other_objp->instance != -1);
+        
+		shipp = &Ships[other_objp->instance];
+		Assert(shipp->ai_index != -1);
+        
+		ai_info	*aip = &Ai_info[shipp->ai_index];
+        
+		if (aip->target_objnum == objnum) {
+			set_target_objnum(aip, -1);
+			//	If this ship had a dynamic goal of chasing the dead ship, clear the dynamic goal.
+			if (aip->resume_goal_time != -1)
+				aip->active_goal = AI_GOAL_NONE;
+		}
+        
+		if (aip->goal_objnum == objnum) {
+			aip->goal_objnum = -1;
+			aip->goal_signature = -1;
+		}
+        
+		if (aip->guard_objnum == objnum) {
+			aip->guard_objnum = -1;
+			aip->guard_signature = -1;
+		}
+        
+		if (aip->hitter_objnum == objnum)
+			aip->hitter_objnum = -1;
+	}
 
 	// single player and multiplayer masters evaluate the scoring and kill stuff
 	if (!MULTIPLAYER_CLIENT) {