diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 3a4a165..d88a246 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -573,7 +573,8 @@
 	/* Try to ensure that the parent directory is there */
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    _PATH_SSH_USER_DIR);
-	mkdir(filename, 0700);
+	if (mkdir(filename, 0700) < 0)
+		fatal("mkdir: %s", strerror(errno));
 
 	snprintf(filename, sizeof(filename), "%.512s/%s", pw->pw_dir,
 	    SSH_PRNG_SEED_FILE);
@@ -782,6 +783,7 @@
 	debug("Loaded %d entropy commands from %.100s", cur_cmd,
 	    cmdfilename);
 
+	fclose(f);
 	return cur_cmd < MIN_ENTROPY_SOURCES ? -1 : 0;
 }