diff --git a/daemon/daemon.c b/daemon/daemon.c
index 1036fcde2..0895c96f2 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -404,6 +404,8 @@ daemon_create_workers(struct daemon* daemon)
 	}
 	daemon->workers = (struct worker**)calloc((size_t)daemon->num, 
 		sizeof(struct worker*));
+	if(!daemon->workers)
+		fatal_exit("out of memory during daemon init");
 	if(daemon->cfg->dnstap) {
 #ifdef USE_DNSTAP
 		daemon->dtenv = dt_create(daemon->cfg->dnstap_socket_path,
diff --git a/doc/Changelog b/doc/Changelog
index 865b49a19..1f20896a7 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 July 2016: Wouter
+	- Fix #801: missing error condition handling in
+	  daemon_create_workers().
+
 20 July 2016: Wouter
 	- Fix typo in unbound.conf.