Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
===================================================================
diff -u -rea0e202415530da3656d8b8646042e5800e10105 -rd300201e7d168ac609be9a7d3225e0ade94c5955
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision ea0e202415530da3656d8b8646042e5800e10105)
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java	(.../MockLearner.java)	(revision d300201e7d168ac609be9a7d3225e0ade94c5955)
@@ -337,9 +337,11 @@
 	    nextResp = handlePageWithoutForms(resp);
 	}
 
-	boolean isActivityFinished = (resp != null)
-		&& ((resp.getText().indexOf(MockLearner.ACTIVITY_FINISHED_FLAG) != -1) || (resp.getText().indexOf(
-			MockLearner.LESSON_FINISHED_FLAG) != -1));
+	String asText = nextResp == null ? null : nextResp.getText();
+	boolean isActivityFinished = (asText != null)
+		&& (asText.contains(MockLearner.ACTIVITY_FINISHED_FLAG)
+			|| asText.contains(MockLearner.LESSON_FINISHED_FLAG) || asText
+			    .contains(MockLearner.LOAD_TOOL_ACTIVITY_FLAG));
 	return isActivityFinished ? nextResp : handleActivity(nextResp);
     }