diff --git a/src/core/sal/SimulatorController.cc b/src/core/sal/SimulatorController.cc
index 87ecc262..e99826f6 100644
--- a/src/core/sal/SimulatorController.cc
+++ b/src/core/sal/SimulatorController.cc
@@ -21,8 +21,6 @@ bool SimulatorController::addListener(BaseListener* li)
 
 BaseListener* SimulatorController::resume(void)
 {
-	if (!hasListeners())
-		return NULL;
 	m_Flows.resume();
 	assert(m_LstList.getLastFired() != NULL &&
 		   "FATAL ERROR: getLastFired() expected to be non-NULL!");
diff --git a/src/core/sal/SimulatorController.hpp b/src/core/sal/SimulatorController.hpp
index 0c0338dc..3e056edb 100644
--- a/src/core/sal/SimulatorController.hpp
+++ b/src/core/sal/SimulatorController.hpp
@@ -202,10 +202,10 @@ public:
 	void clearListeners(ExperimentFlow *flow = 0) { m_LstList.remove(flow); }
 	/**
 	 * Switches the control flow to the simulator and waits on any listeners
-	 * which have been added to the listener management. If one of those listeners
-	 * occurs, resume() will return the pointer of that listener.
-	 * @return the previously occurred listener, or \c NULL if there are no
-	 *         listeners to wait for
+	 * which have been added to the listener management.  If one of those listeners
+	 * occurs, resume() will return the pointer of that listener.  If there are
+	 * no more active listeners for this experiment, resume() never returns.
+	 * @return the previously occurred listener
 	 */
 	BaseListener* resume();
 	/**