diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index f098dc1f056..9f002f92e0b 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -43,6 +43,7 @@
 		var/checktime = text2num(query_validate_time.item[1])
 		if(!checktime)
 			to_chat(src, "Datetime entered is improperly formatted or not later than current server time.")
+			qdel(query_validate_time)
 			return
 		endtime = query_validate_time.item[1]
 	qdel(query_validate_time)
diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm
index a050eb52383..9a4a81bdf53 100644
--- a/code/modules/admin/sql_message_system.dm
+++ b/code/modules/admin/sql_message_system.dm
@@ -68,6 +68,7 @@
 				var/checktime = text2num(query_validate_expire_time.item[1])
 				if(!checktime)
 					to_chat(usr, "Datetime entered is improperly formatted or not later than current server time.")
+					qdel(query_validate_expire_time)
 					return
 				expiry = query_validate_expire_time.item[1]
 			qdel(query_validate_expire_time)
@@ -192,11 +193,14 @@
 			var/datum/DBQuery/query_validate_expire_time_edit = SSdbcore.NewQuery("SELECT IF(STR_TO_DATE('[expire_time]','%Y-%c-%d %T') > NOW(), STR_TO_DATE('[expire_time]','%Y-%c-%d %T'), 0)")
 			if(!query_validate_expire_time_edit.warn_execute())
 				qdel(query_validate_expire_time_edit)
+				qdel(query_find_edit_expiry_message)
 				return
 			if(query_validate_expire_time_edit.NextRow())
 				var/checktime = text2num(query_validate_expire_time_edit.item[1])
 				if(!checktime)
 					to_chat(usr, "Datetime entered is improperly formatted or not later than current server time.")
+					qdel(query_validate_expire_time_edit)
+					qdel(query_find_edit_expiry_message)
 					return
 				new_expiry = query_validate_expire_time_edit.item[1]
 			qdel(query_validate_expire_time_edit)
@@ -204,6 +208,7 @@
 		var/datum/DBQuery/query_edit_message_expiry = SSdbcore.NewQuery("UPDATE [format_table_name("messages")] SET expire_timestamp = [expire_time == "-1" ? "NULL" : "'[new_expiry]'"], lasteditor = '[editor_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE id = [message_id] AND deleted = 0")
 		if(!query_edit_message_expiry.warn_execute())
 			qdel(query_edit_message_expiry)
+			qdel(query_find_edit_expiry_message)
 			return
 		qdel(query_edit_message_expiry)
 		log_admin_private("[key_name(usr)] has edited the expiration time of a [type] [(type == "note" || type == "message" || type == "watchlist entry") ? " for [target_ckey]" : ""] made by [admin_ckey] from [old_expiry] to [new_expiry]")