diff --git a/exec/util.c b/exec/util.c
index 16ba3c84..064bee22 100644
--- a/exec/util.c
+++ b/exec/util.c
@@ -1,182 +1,186 @@
 /*
  * Copyright (c) 2002-2004 MontaVista Software, Inc.
  * Copyright (c) 2004 Open Source Development Lab
  * Copyright (c) 2006-2007, 2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
  * Author: Steven Dake (sdake@redhat.com), Mark Haverkamp (markh@osdl.org)
  *
  * This software licensed under BSD license, the text of which follows:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
  * - Neither the name of the MontaVista Software, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived from this
  *   software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <config.h>
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/time.h>
 #include <assert.h>
 
 #include <corosync/corotypes.h>
 #include <corosync/corodefs.h>
 #include <corosync/list.h>
 #include <corosync/engine/logsys.h>
 #include "util.h"
 
 LOGSYS_DECLARE_SUBSYS ("MAIN");
 
 struct service_names {
 	const char *c_name;
 	int32_t c_val;
 };
 
 static struct service_names servicenames[] =
 {
 	{ "EVS", EVS_SERVICE },
 	{ "CLM", CLM_SERVICE },
 	{ "AMF", AMF_SERVICE },
 	{ "CKPT", CKPT_SERVICE },
 	{ "EVT", EVT_SERVICE },
 	{ "LCK", LCK_SERVICE },
 	{ "MSG", MSG_SERVICE },
 	{ "CFG", CFG_SERVICE },
 	{ "CPG", CPG_SERVICE },
 	{ "CMAN", CMAN_SERVICE },
 	{ "PCMK", PCMK_SERVICE },
 	{ "CONFDB", CONFDB_SERVICE },
 	{ "QUORUM", QUORUM_SERVICE },
 	{ "PLOAD", PLOAD_SERVICE },
 	{ "TMR", TMR_SERVICE },
 	{ "VOTEQUORUM", VOTEQUORUM_SERVICE },
 	{ "NTF", NTF_SERVICE },
 	{ "AMF", AMF_V2_SERVICE },
 	{ "TST", TST_SV1_SERVICE },
 	{ "TST", TST_SV2_SERVICE },
 	{ "MON", MON_SERVICE },
 	{ "WD", WD_SERVICE },
 	{ NULL, -1 }
 };
 
 const char * short_service_name_get(uint32_t service_id,
 	char *buf, size_t buf_size)
 {
 	uint32_t i;
 
 	for (i = 0; servicenames[i].c_name != NULL; i++) {
 		if (service_id == servicenames[i].c_val) {
 			return (servicenames[i].c_name);
 		}
 	}
 	snprintf(buf, buf_size, "%d", service_id);
 	return buf;
 }
 
 /*
  * Compare two names.  returns non-zero on match.
  */
 int name_match(cs_name_t *name1, cs_name_t *name2)
 {
 	if (name1->length == name2->length) {
 		return ((strncmp ((char *)name1->value, (char *)name2->value,
 			name1->length)) == 0);
 	}
 	return 0;
 }
 
 /*
  * Get the time of day and convert to nanoseconds
  */
 cs_time_t clust_time_now(void)
 {
 	struct timeval tv;
 	cs_time_t time_now;
 
 	if (gettimeofday(&tv, 0)) {
 		return 0ULL;
 	}
 
 	time_now = (cs_time_t)(tv.tv_sec) * 1000000000ULL;
 	time_now += (cs_time_t)(tv.tv_usec) * 1000ULL;
 
 	return time_now;
 }
 
 void _corosync_out_of_memory_error (void) __attribute__((noreturn));
 void _corosync_out_of_memory_error (void)
 {
 	assert (0==1);
 	exit (EXIT_FAILURE);
 }
 
 void _corosync_exit_error (
 	enum e_ais_done err, const char *file, unsigned int line)  __attribute__((noreturn));
 
 void _corosync_exit_error (
 	enum e_ais_done err, const char *file, unsigned int line)
 {
-	log_printf (LOGSYS_LEVEL_ERROR, "Corosync Cluster Engine exiting "
-		"with status %d at %s:%u.\n", err, file, line);
-
+	if (err == AIS_DONE_EXIT) {
+		log_printf (LOGSYS_LEVEL_NOTICE,
+			"Corosync Cluster Engine exiting normally");
+	} else {
+		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Cluster Engine exiting "
+			"with status %d at %s:%u.\n", err, file, line);
+	}
 	qb_log_fini();
 	exit (err);
 }
 
 #define min(a,b) ((a) < (b) ? (a) : (b))
 
 char *getcs_name_t (cs_name_t *name)
 {
 	static char ret_name[CS_MAX_NAME_LENGTH];
 
 	/* if string is corrupt (non-terminated), ensure it's displayed safely */
 	if (name->length >= CS_MAX_NAME_LENGTH || name->value[name->length] != '\0') {
 		memset (ret_name, 0, sizeof (ret_name));
 		memcpy (ret_name, name->value, min(name->length, CS_MAX_NAME_LENGTH -1));
 		return (ret_name);
 	}
 	return ((char *)name->value);
 }
 
 void setcs_name_t (cs_name_t *name, char *str) {
 	strncpy ((char *)name->value, str, sizeof (name->value));
 	((char *)name->value)[sizeof (name->value) - 1] = '\0';
 	if (strlen ((char *)name->value) > CS_MAX_NAME_LENGTH) {
 		name->length = CS_MAX_NAME_LENGTH;
 	} else {
 		name->length = strlen (str);
 	}
 }
 
 int cs_name_tisEqual (cs_name_t *str1, char *str2) {
 	if (str1->length == strlen (str2)) {
 		return ((strncmp ((char *)str1->value, (char *)str2,
 			str1->length)) == 0);
 	} else {
 		return 0;
 	}
 }