diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c
index 62ef577..27f51ca 100644
--- a/src/irc/core/irc-expandos.c
+++ b/src/irc/core/irc-expandos.c
@@ -138,7 +138,7 @@ static char *expando_cumode_space(SERVER_REC *server, void *item, int *free_ret)
                 return "";
 
 	ret = expando_cumode(server, item, free_ret);
-	return *ret == '\0' ? " " : ret;
+	return *ret == '\0' ? g_free(ret) , " " : ret;
 }
 
 static void event_join(IRC_SERVER_REC *server, const char *data,
diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c
index 912129b..5000928 100644
--- a/src/irc/dcc/dcc-send.c
+++ b/src/irc/dcc/dcc-send.c
@@ -425,6 +425,7 @@ static int dcc_send_one_file(int queue, const char *target, const char *fname,
 	g_free(str);
 	if (dcc == NULL) {
 		g_warn_if_reached();
+		close(hfile);
 		return FALSE;
 	}