diff --git a/lib/cli.py b/lib/cli.py
index 226f45347fd9783afa184495db6e4b388a4e0445..71d010f713545d4171db0d78e93d5ca27e775198 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -452,7 +452,7 @@ def PollJob(job_id, cl=None, feedback_fn=None):
 
   status, result = jobs[0]
   if status == constants.JOB_STATUS_SUCCESS:
-    return result[0]
+    return result
   else:
     raise errors.OpExecError(result)
 
@@ -470,7 +470,9 @@ def SubmitOpCode(op, cl=None, feedback_fn=None):
 
   job_id = SendJob([op], cl)
 
-  return PollJob(job_id, cl=cl, feedback_fn=feedback_fn)
+  op_results = PollJob(job_id, cl=cl, feedback_fn=feedback_fn)
+
+  return op_results[0]
 
 
 def SubmitOrSend(op, opts, cl=None, feedback_fn=None):