diff --git a/tools/corosync-keygen.c b/tools/corosync-keygen.c
index 5b70d521..b4e0f24f 100644
--- a/tools/corosync-keygen.c
+++ b/tools/corosync-keygen.c
@@ -1,107 +1,119 @@
 /*
  * Copyright (c) 2004 MontaVista Software, Inc.
  *
  * All rights reserved.
  *
  * Author: Steven Dake (sdake@redhat.com)
  *
  * 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 <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <netinet/in.h>
 
 #define KEYFILE SYSCONFDIR "/ais/authkey"
 
 int main (void) {
 	int authkey_fd;
 	int random_fd;
 	unsigned char key[128];
 	ssize_t res;
-	
+
 	printf ("Corosync Cluster Engine Authentication key generator.\n");
 	if (geteuid() != 0) {
 		printf ("Error: Authorization key must be generated as root user.\n");
 		exit (1);
 	}
-	mkdir (SYSCONFDIR "/ais", 0700);
+	if (mkdir (SYSCONFDIR "/ais", 0700)) {
+		perror ("Failed to create directory: " SYSCONFDIR "/ais");
+		exit (1);
+	}
 
 	printf ("Gathering %lu bits for key from /dev/random.\n", (unsigned long)(sizeof (key) * 8));
 	random_fd = open ("/dev/random", O_RDONLY);
 	if (random_fd == -1) {
 		perror ("Is /dev/random present? Opening /dev/random");
 		exit (1);
 	}
 
 	/*
 	 * Read random data
 	 */
 	res = read (random_fd, key, sizeof (key));
-	if (res == -1) {
+	if (res != sizeof (key)) {
 		perror ("Could not read /dev/random");
 		exit (1);
 	}
+	close (random_fd);
 
 	/*
 	 * Open key
 	 */
 	authkey_fd = open (KEYFILE, O_CREAT|O_WRONLY, 600);
 	if (authkey_fd == -1) {
 		perror ("Could not create " KEYFILE);
 		exit (1);
 	}
 	/*
 	 * Set security of authorization key to uid = 0 gid = 0 mode = 0400
 	 */
 	res = fchown (authkey_fd, 0, 0);
 	if (res == -1) {
 		perror ("Could not fchown key to uid 0 and gid 0\n");
 		exit (1);
 	}
-	fchmod (authkey_fd, 0400);
+	if (fchmod (authkey_fd, 0400)) {
+		perror ("Failed to set key file permissions to 0400\n");
+		exit (1);
+	}
 
 	printf ("Writing corosync key to " KEYFILE ".\n");
 
 	/*
 	 * Write key
 	 */
 	res = write (authkey_fd, key, sizeof (key));
-	if (res == -1) {
+	if (res != sizeof (key)) {
+		perror ("Could not write " KEYFILE);
+		exit (1);
+	}
+
+	if (close (authkey_fd)) {
 		perror ("Could not write " KEYFILE);
 		exit (1);
 	}
-	
+
 	return (0);
 }