9 files changed, 18 insertions, 21 deletions
diff --git a/src/async/async_worker.c b/src/async/async_worker.c
index 3d807395ddc..7a88ac9dd6e 100644
--- a/src/async/async_worker.c
+++ b/src/async/async_worker.c
@@ -340,11 +340,11 @@ __wt_async_worker(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "async worker error");
+err:		WT_PANIC_MSG(session, ret, "async worker error");
 	}
 	/*
-	 * Worker thread cleanup, close our cached cursors and
-	 * free all the WT_ASYNC_CURSOR structures.
+	 * Worker thread cleanup, close our cached cursors and free all the
+	 * WT_ASYNC_CURSOR structures.
 	 */
 	ac = STAILQ_FIRST(&worker.cursorqh);
 	while (ac != NULL) {
diff --git a/src/btree/bt_evict.c b/src/btree/bt_evict.c
index ff049553c7f..d26abfff379 100644
--- a/src/btree/bt_evict.c
+++ b/src/btree/bt_evict.c
@@ -195,13 +195,8 @@ __evict_server(void *arg)
 		WT_ERR(__wt_verbose(session, WT_VERB_EVICTSERVER, "waking"));
 	}
 
-	WT_ERR(__wt_verbose(session, WT_VERB_EVICTSERVER, "exiting"));
-
-err:	
-	if (ret != 0) {
-		WT_PANIC_MSG(session, ret, "eviction server error");
-		return (NULL);
-	}
+	WT_ERR(__wt_verbose(
+	    session, WT_VERB_EVICTSERVER, "cache eviction server exiting"));
 
 	if (cache->pages_inmem != cache->pages_evict)
 		__wt_errx(session,
@@ -219,6 +214,9 @@ err:
 		    " bytes dirty and %" PRIu64 " pages dirty",
 		    cache->bytes_dirty, cache->pages_dirty);
 
+	if (0) {
+err:		WT_PANIC_MSG(session, ret, "cache eviction server error");
+	}
 	return (NULL);
 }
 
@@ -364,13 +362,12 @@ __evict_worker(void *arg)
 		else
 			WT_ERR(__evict_lru_pages(session, 1));
 	}
+	WT_ERR(__wt_verbose(
+	    session, WT_VERB_EVICTSERVER, "cache eviction worker exiting"));
 
 	if (0) {
-err:		__wt_err(session, ret, "cache eviction helper error");
+err:		WT_PANIC_MSG(session, ret, "cache eviction worker error");
 	}
-
-	WT_TRET(__wt_verbose(session, WT_VERB_EVICTSERVER, "helper exiting"));
-
 	return (NULL);
 }
 
diff --git a/src/conn/conn_cache_pool.c b/src/conn/conn_cache_pool.c
index ba80ac15267..ee0148e29d9 100644
--- a/src/conn/conn_cache_pool.c
+++ b/src/conn/conn_cache_pool.c
@@ -633,7 +633,7 @@ __wt_cache_pool_server(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "cache pool manager server error");
+err:		WT_PANIC_MSG(session, ret, "cache pool manager server error");
 	}
 	return (NULL);
 }
diff --git a/src/conn/conn_ckpt.c b/src/conn/conn_ckpt.c
index ab97d4ead46..e631752f1ea 100644
--- a/src/conn/conn_ckpt.c
+++ b/src/conn/conn_ckpt.c
@@ -99,7 +99,7 @@ __ckpt_server(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "checkpoint server error");
+err:		WT_PANIC_MSG(session, ret, "checkpoint server error");
 	}
 	return (NULL);
 }
diff --git a/src/conn/conn_log.c b/src/conn/conn_log.c
index b2555cfebf5..446aa07800f 100644
--- a/src/conn/conn_log.c
+++ b/src/conn/conn_log.c
@@ -158,7 +158,7 @@ __log_archive_server(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "log archive server error");
+err:		WT_PANIC_MSG(session, ret, "log archive server error");
 	}
 	if (locked_archive)
 		WT_TRET(__wt_writeunlock(session, log->log_archive_lock));
diff --git a/src/conn/conn_stat.c b/src/conn/conn_stat.c
index f7229504898..dd49e7359cc 100644
--- a/src/conn/conn_stat.c
+++ b/src/conn/conn_stat.c
@@ -413,7 +413,7 @@ __statlog_server(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "statistics log server error");
+err:		WT_PANIC_MSG(session, ret, "statistics log server error");
 	}
 	__wt_buf_free(session, &path);
 	__wt_buf_free(session, &tmp);
diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c
index 3bccc5814be..7d427f6c816 100644
--- a/src/conn/conn_sweep.c
+++ b/src/conn/conn_sweep.c
@@ -117,7 +117,7 @@ __sweep_server(void *arg)
 	}
 
 	if (0) {
-err:		__wt_err(session, ret, "handle sweep server error");
+err:		WT_PANIC_MSG(session, ret, "handle sweep server error");
 	}
 	return (NULL);
 }
diff --git a/src/lsm/lsm_manager.c b/src/lsm/lsm_manager.c
index 8f4b3ba49ef..71e4724f91c 100644
--- a/src/lsm/lsm_manager.c
+++ b/src/lsm/lsm_manager.c
@@ -499,7 +499,7 @@ __lsm_worker_manager(void *arg)
 	WT_ERR(__lsm_manager_worker_shutdown(session));
 
 	if (ret != 0) {
-err:		__wt_err(session, ret, "LSM worker manager thread error");
+err:		WT_PANIC_MSG(session, ret, "LSM worker manager thread error");
 	}
 	F_CLR(S2C(session), WT_CONN_SERVER_LSM);
 	return (NULL);
diff --git a/src/lsm/lsm_worker.c b/src/lsm/lsm_worker.c
index f24e58148b1..955dd09193b 100644
--- a/src/lsm/lsm_worker.c
+++ b/src/lsm/lsm_worker.c
@@ -160,7 +160,7 @@ __lsm_worker(void *arg)
 
 	if (ret != 0) {
 err:		__wt_lsm_manager_free_work_unit(session, entry);
-		__wt_err(session, ret,
+		WT_PANIC_MSG(session, ret,
 		    "Error in LSM worker thread %d", cookie->id);
 	}
 	return (NULL);