diff --git a/src/datum_api.c b/src/datum_api.c
index 235c22c..4020bf9 100644
--- a/src/datum_api.c
+++ b/src/datum_api.c
@@ -1174,6 +1174,7 @@ void *datum_api_thread(void *ptr) {
 	daemon = MHD_start_daemon(MHD_USE_AUTO | MHD_USE_INTERNAL_POLLING_THREAD, datum_config.api_listen_port, NULL, NULL, &datum_api_answer, NULL,
 	                          MHD_OPTION_CONNECTION_LIMIT, 128,
 	                          MHD_OPTION_NOTIFY_COMPLETED, datum_api_request_completed, NULL,
+	                          MHD_OPTION_LISTENING_ADDRESS_REUSE, (unsigned int)1,
 	                          MHD_OPTION_END);
 	
 	if (!daemon) {
diff --git a/src/datum_sockets.c b/src/datum_sockets.c
index a5c457e..f849664 100644
--- a/src/datum_sockets.c
+++ b/src/datum_sockets.c
@@ -578,8 +578,8 @@ void *datum_gateway_listener_thread(void *arg) {
 	app->datum_active_threads = 0;
 	
 	listen_sock = socket(AF_INET, SOCK_STREAM, 0);
-	if (!listen_sock) {
-		DLOG_FATAL("Could get socket: %s", strerror(errno));
+	if (-1 == listen_sock) {
+		DLOG_FATAL("Could not create listening socket: %s", strerror(errno));
 		panic_from_thread(__LINE__);
 		return NULL;
 	}