diff --git a/lib/cli.py b/lib/cli.py
index cfa64f2d4690758dea073e8f024b7e1c9e89f13d..fefd2b71b6614e91049c02d4e3a561fa986e369c 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -1004,7 +1004,6 @@ class JobExecutor(object):
     """
     self.queue.append((name, ops))
 
-
   def SubmitPending(self):
     """Submit all pending jobs.
 
diff --git a/scripts/gnt-debug b/scripts/gnt-debug
index d3bf05450c3c08cc6ad94de10d744dbc4d3273cd..3a12b2b7aaa9c1ec111a6d0f00c7ec081706243f 100755
--- a/scripts/gnt-debug
+++ b/scripts/gnt-debug
@@ -71,19 +71,14 @@ def GenericOpCodes(opts, args):
 
   """
   cl = cli.GetClient()
-  job_data = []
-  job_ids = []
+  jex = cli.JobExecutor(cl=cl)
+
   for fname in args:
     op_data = simplejson.loads(open(fname).read())
     op_list = [opcodes.OpCode.LoadOpCode(val) for val in op_data]
-    job_data.append((fname, op_list))
-  for fname, op_list in job_data:
-    jid = cli.SendJob(op_list, cl=cl)
-    ToStdout("File '%s', job id: %s", fname, jid)
-    job_ids.append(jid)
-  for jid in job_ids:
-    ToStdout("Waiting for job id %s", jid)
-    cli.PollJob(jid, cl=cl)
+    jex.QueueJob("file %s" % fname, *op_list)
+
+  jex.GetResults()
   return 0