diff --git a/src/apps/relay/ns_ioalib_engine_impl.c b/src/apps/relay/ns_ioalib_engine_impl.c
index 851bd62..44f2917 100644
--- a/src/apps/relay/ns_ioalib_engine_impl.c
+++ b/src/apps/relay/ns_ioalib_engine_impl.c
@@ -1131,9 +1131,7 @@ int create_relay_ioa_sockets(ioa_engine_handle e, ioa_socket_handle client_s, in
     if (!rtcp_map_put(e->map_rtcp, *out_reservation_token, *rtcp_s)) {
       TURN_LOG_FUNC(TURN_LOG_LEVEL_ERROR, "%s: cannot update RTCP map\n", __FUNCTION__);
       IOA_CLOSE_SOCKET(*rtp_s);
-      if (rtcp_s) {
-        IOA_CLOSE_SOCKET(*rtcp_s);
-      }
+      IOA_CLOSE_SOCKET(*rtcp_s);
       return -1;
     }
   }
diff --git a/src/server/ns_turn_maps_rtcp.h b/src/server/ns_turn_maps_rtcp.h
index 5ee18dd..8dc9ebc 100644
--- a/src/server/ns_turn_maps_rtcp.h
+++ b/src/server/ns_turn_maps_rtcp.h
@@ -61,7 +61,7 @@ rtcp_map *rtcp_map_create(ioa_engine_handle e);
  * true - success
  * false - error
  */
-bool rtcp_map_put(rtcp_map *map, rtcp_token_type key, ioa_socket_handle s);
+bool rtcp_map_put(rtcp_map *map, rtcp_token_type token, ioa_socket_handle s);
 
 /**
  * @ret: