Index: code/ai/aicode.cpp
===================================================================
--- code/ai/aicode.cpp	(revision 9405)
+++ code/ai/aicode.cpp	(working copy)
@@ -11464,6 +11464,12 @@
 	}
 	
 	if (aip->mode == AIM_WAYPOINTS) {
+
+		// skip if wing leader has no waypoint order
+		if(laip->mode != AIM_WAYPOINTS){
+			return 1;
+		}
+
 		aip->wp_list = laip->wp_list;
 		aip->wp_index = laip->wp_index;
 		aip->wp_flags = laip->wp_flags;