diff --git a/crm/admin/crm_uuid.c b/crm/admin/crm_uuid.c
index a5b0559e10..00303768c4 100644
--- a/crm/admin/crm_uuid.c
+++ b/crm/admin/crm_uuid.c
@@ -1,174 +1,181 @@
 
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <lha_internal.h>
 
 #include <sys/param.h>
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
 
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
 
 #include <hb_api.h>
 #include <clplumbing/cl_malloc.h>
 #include <clplumbing/uids.h>
-#include <clplumbing/Gmain_timeout.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
 #endif
 
 #define UUID_LEN 16
 #define UUID_FILE HA_VARLIBDIR"/"PACKAGE"/hb_uuid"
 
 #define OPTARGS	"rw:"
 
-int read_hb_uuid(void);
-int write_hb_uuid(const char *buffer);
+int read_local_hb_uuid(void);
+int write_local_hb_uuid(const char *buffer);
 
 static void usage(void) 
 {
 	fprintf(stderr, "crm_uuid [-r|-w new_ascii_value]\n");
 	exit(1);
 }
 
 int
 main(int argc, char **argv)
 {
 	int flag;
+	int rc = 0;
 	
 	cl_log_enable_stderr(TRUE);
 
 	if(argc == 1) {
 		/* no arguments specified, default to read */
-		read_hb_uuid();	
-		return 0;
+		rc = read_local_hb_uuid();	
+		return rc;
 	}
 	
 	while (1) {
 		flag = getopt(argc, argv, OPTARGS);
 		if (flag == -1) {
 			break;
 		}
 		switch(flag) {
 			case 'r':
-				read_hb_uuid();	
+				rc = read_local_hb_uuid();	
 				break;
 			case 'w':
-				write_hb_uuid(optarg);
+				rc = write_local_hb_uuid(optarg);
 				break;
 			default:
 				usage();
 				break;
 		}
 	}
-	return 0;
+	return rc;
 }
 
-int read_hb_uuid(void) 
+int
+read_local_hb_uuid(void) 
 {
 	int rc = 0;
 	cl_uuid_t uuid;
 	char *buffer = NULL;
 	long start = 0, read_len = 0;
 
 	FILE *input = fopen(UUID_FILE, "r");
 	
 	if(input == NULL) {
 		cl_perror("Could not open UUID file %s\n", UUID_FILE);
 		return 1;
 	}
 	
 	/* see how big the file is */
 	start  = ftell(input);
 	fseek(input, 0L, SEEK_END);
 	if(UUID_LEN != ftell(input)) {
 		fprintf(stderr, "%s must contain exactly %d bytes\n",
 			UUID_FILE, UUID_LEN);
 		abort();
 	}
 	
 	fseek(input, 0L, start);
 	
 	if(start != ftell(input)) {
 		fprintf(stderr, "fseek not behaving: %ld vs. %ld\n",
 			start, ftell(input));
 		rc = 2;
 		goto bail;
 	}
 
 /* 	fprintf(stderr, "Reading %d bytes from: %s\n", UUID_LEN, UUID_FILE); */
 
 	buffer = cl_malloc(50);
 	read_len = fread(uuid.uuid, 1, UUID_LEN, input);
 	if(read_len != UUID_LEN) {
 		fprintf(stderr, "Expected and read bytes differ: %d vs. %ld\n",
 			UUID_LEN, read_len);
 		rc = 3;
 		goto bail;
 		
 	} else if(buffer != NULL) {
 		cl_uuid_unparse(&uuid, buffer);
 		fprintf(stdout, "%s\n", buffer);
 
 	} else {
 		fprintf(stderr, "No buffer to unparse\n");
+		rc = 4;
 	}
 
   bail:	
 	cl_free(buffer);
 	fclose(input);
 
 	return rc;
 }
 
-int write_hb_uuid(const char *new_value) 
+int
+write_local_hb_uuid(const char *new_value) 
 {
 	int fd;
-	int rc;
+	int rc = 0;
 	cl_uuid_t uuid;
 	char *buffer = strdup(new_value);
 	rc = cl_uuid_parse(buffer, &uuid);
 	if(rc != 0) {
-		fprintf(stderr, "Invalid ASCII UUID supplied: %s\n", new_value);
-		fprintf(stderr, "ASCII UUIDs must be of the form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX and contain only letters and digits\n");
-		return 1;
+		fprintf(stderr, "Invalid ASCII UUID supplied: [%s]\n", new_value);
+		fprintf(stderr, "ASCII UUIDs must be of the form"
+		" XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+		" and contain only letters and digits\n");
+		return 5;
 	}
 	
 	if ((fd = open(UUID_FILE, O_WRONLY|O_SYNC|O_CREAT, 0644)) < 0) {
 		cl_perror("Could not open %s", UUID_FILE);
-		return 1;
+		return 6;
 	}
 	
 	if (write(fd, uuid.uuid, UUID_LEN) != UUID_LEN) {
 		cl_perror("Could not write UUID to %s", UUID_FILE);
+		rc=7;
 	}
 	
 	if (close(fd) < 0) {
 		cl_perror("Could not close %s", UUID_FILE);
+		rc=8;
 	}
-	return 0;
+	return rc;
 }