diff --git a/src/adhoc_commands.py b/src/adhoc_commands.py
index 84469cc29..453afffae 100644
--- a/src/adhoc_commands.py
+++ b/src/adhoc_commands.py
@@ -442,7 +442,11 @@ class CommandWindow:
 
 			# no commands => no commands stage
 			# commands => command selection stage
-			items = response.getTag('query').getTags('item')
+			query = response.getTag('query')
+			if query:
+				items = query.getTags('item')
+			else:
+				items = []
 			if len(items)==0:
 				self.commandlist = []
 				self.stage4()