diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index e9564b7010..9fabb50575 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -512,7 +512,7 @@ bool CLIENT_STATE::scheduler_rpc_poll() {
             if (nactive_results < host_info.p_ncpus) {
                 msg_printf(NULL, MSG_INFO, "Fewer active results than CPUs; requesting more work");
             } else {
-                msg_printf(NULL, MSG_INFO, "Cache low-water mark hit; requesting more work");
+                msg_printf(NULL, MSG_INFO, "Min work level reached: requesting more work");
             }
             compute_resource_debts();
             scheduler_op->init_get_work();
diff --git a/sched/validate.C b/sched/validate.C
index 8a6c353a8a..ca7a443ee0 100644
--- a/sched/validate.C
+++ b/sched/validate.C
@@ -356,7 +356,8 @@ mark_validated:
     if (retval) {
         log_messages.printf(
             SCHED_MSG_LOG::CRITICAL,
-            "[WU#%d %s] wu.update() failed: %d\n", wu.id, wu.name, retval
+            "[WU#%d %s] wu.update() failed: %d; exiting\n", wu.id, wu.name, retval
+            exit(1);
         );
     }
 }