diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 2ae22aae718..70af98fa0dd 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -165,9 +165,13 @@
 			parser.query = query_tree
 			var/list/parsed_tree
 			parsed_tree = parser.parse()
-			querys.len = querys_pos
-			querys[querys_pos] = parsed_tree
-			querys_pos++
+			if(parsed_tree.len > 0)
+				querys.len = querys_pos
+				querys[querys_pos] = parsed_tree
+				querys_pos++
+			else //There was an error so don't run anything, and tell the user which query has errored.
+				usr << "<span class='danger'>Parsing error on [querys_pos]\th query. Nothing was executed.</span>"
+				return list()
 			query_tree = list()
 			do_parse = 0
 		else