diff --git a/src/agent_map.c b/src/agent_map.c
index 6df2ccbc4034de615a06acdc96d5b87bc6ecdebc..144b6cbe4ee4d18b8e2aab1d67fd53bdbfdb4e65 100644
--- a/src/agent_map.c
+++ b/src/agent_map.c
@@ -1704,9 +1704,6 @@ int handle_ap_autoconfig_wsc(void *agent, struct cmdu_buff *rx_cmdu)
 			 */
 			agent_autoconfig_event(a, radio->name, "teardown",
 					"M2 process failure");
-			/* possible to fail processing with ext generated */
-			if (ext)
-				free(ext);
 			return -1;
 		}
 
@@ -4661,12 +4658,8 @@ int handle_hld_message(void *agent, struct cmdu_buff *rx_cmdu)
 						   a->privkey,
 						   usrdata, tlen,
 						   &out);
-		if (ret || !out.data) {
+		if (ret) {
 			err("Error processing dyn-controller-config-sync response\n");
-			/* if m2 keywrap was missing, out.data may be allocated
-			 * despite failure */
-			if (out.data)
-				free(out.data);
 			goto error;
 		}