Index: code/mission/missiontraining.cpp
===================================================================
--- code/mission/missiontraining.cpp	(revision 6057)
+++ code/mission/missiontraining.cpp	(working copy)
@@ -785,6 +785,8 @@
 	training_process_message(Training_buf);
 	Training_num_lines = split_str(Training_buf, TRAINING_LINE_WIDTH, Training_line_sizes, Training_lines, MAX_TRAINING_MESSAGE_LINES);
 
+	Assert( Training_num_lines >= 0, "split_str encountered an error" );
+
 	if (message_play_training_voice(Messages[m].wave_info.index) < 0) {
 		if (length > 0)
 			Training_message_timestamp = timestamp(length * 1000);
@@ -917,20 +919,18 @@
 		return;
 	}
 
-	// next two lines moved to message_training_setup() - taylor
-//	training_process_message(Training_buf);
-//	Training_num_lines = split_str(Training_buf, TRAINING_LINE_WIDTH, Training_line_sizes, Training_lines, MAX_TRAINING_MESSAGE_LINES);
+	// the code that preps the training message and counts the number of lines
+	// has been moved to message_training_setup()
 
-	Assert(Training_num_lines > 0);
+	if (Training_num_lines <= 0){
+		return;
+	}
+
 	for (i=0; i<Training_num_lines; i++) {
 		Training_lines[i][Training_line_sizes[i]] = 0;
 		drop_leading_white_space(Training_lines[i]);
 	}
 
-	if (Training_num_lines <= 0){
-		return;
-	}
-
 	height = gr_get_font_height();
 	gr_set_shader(&Training_msg_glass);
 	gr_shade(Training_message_window_coords[gr_screen.res][0], Training_message_window_coords[gr_screen.res][1], TRAINING_MESSAGE_WINDOW_WIDTH, Training_num_lines * height + height);