Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java
===================================================================
RCS file: /usr/local/cvsroot/TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java,v
diff -u -r1.2 -r1.3
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java	31 Jul 2006 23:40:22 -0000	1.2
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java	1 Aug 2006 23:44:33 -0000	1.3
@@ -85,7 +85,7 @@
 				authorTest.start();
 			if (monitorTest != null)
 				monitorTest.start();
-			if (learnerTest != null)
+			if ((learnerTest != null)&&(monitorTest != null))
 				learnerTest.start();
 			if(monitorTest != null){
 				CountDownLatch stopSignal = new CountDownLatch(1);
Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java
===================================================================
RCS file: /usr/local/cvsroot/TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java,v
diff -u -r1.1 -r1.2
--- TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java	31 Jul 2006 02:04:30 -0000	1.1
+++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MonitorTest.java	1 Aug 2006 23:35:42 -0000	1.2
@@ -58,6 +58,8 @@
     private String lessonName;
     
     private String lsId;
+    
+    private Thread monitorThread;
 
     /**
      * MonitorTest Construtor
@@ -88,7 +90,8 @@
 			monitor.startLesson(startLessonURL,lsId,monitor.getUserId());
 		}
 		//monitor learners progress
-		new Thread(monitor, monitor.getUsername()).start();
+		monitorThread = new Thread(monitor, monitor.getUsername());
+		monitorThread.start();
 	}
 
 	@Override
@@ -102,7 +105,11 @@
 	}
 
 	public void notifyMonitorToStop(CountDownLatch stopSignal){
-		((MockMonitor)users[0]).setStopFlag(stopSignal);
+		if(monitorThread.isAlive()){
+			((MockMonitor)users[0]).setStopFlag(stopSignal);
+		}else{
+			stopSignal.countDown();
+		}
 	}
 
 	public final String getCreateLessonClassURL() {