1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/irm.c b/src/lib/irm.c
index 2c9b530c..69a98039 100644
--- a/src/lib/irm.c
+++ b/src/lib/irm.c
@@ -46,13 +46,17 @@ int irm_create_ipcp(rina_name_t name,
         msg.msgs.create_ipcp.ipcp_type = ipcp_type;
 
         buf = serialize_irm_msg(&msg);
-        if (buf == NULL)
+        if (buf == NULL) {
+                close(sockfd);
                 return -1;
+        }
 
-        write(sockfd, buf->data, buf->size);
+        if (write(sockfd, buf->data, buf->size) == -1) {
+                close(sockfd);
+                return -1;
+        }
 
         close(sockfd);
-
         return 0;
 }