diff --git a/owlps-aggregator/owlps-aggregatord.c b/owlps-aggregator/owlps-aggregatord.c
index b507cbc..565f4e8 100644
--- a/owlps-aggregator/owlps-aggregatord.c
+++ b/owlps-aggregator/owlps-aggregatord.c
@@ -46,7 +46,8 @@ int main(int argc, char **argv)
       fprintf(stderr,
               "Error! Cannot listen on port %"PRIuFAST16".\n",
               listening_port) ;
-      return ERR_CREATING_SOCKET ;
+      ret = ERR_CREATING_SOCKET ;
+      goto exit ;
     }
 
   /* Set up threads */
@@ -63,6 +64,7 @@ int main(int argc, char **argv)
   run = TRUE ;
   ret = read_loop(sockfd) ;
 
+ exit:
   (void) close(sockfd) ; // Close socket
   free_request_list() ;
   free_ap_list() ;