--- cloudinit/cmd/main.py.orig
+++ cloudinit/cmd/main.py
@@ -681,6 +681,10 @@ def main(sysv_args=None):
         rname, rdesc = ("dhclient-hook",
                         "running dhclient-hook module")
 
+    elif name == 'query':
+        print('Action query is not yet implemented')
+        sys.exit(1)
+
     args.reporter = events.ReportEventStack(
         rname, rdesc, reporting_enabled=report_on)