diff --git a/lib/jqueue.py b/lib/jqueue.py
index a830fdae6e04c95145c1de076794e8728fa1c361..49ce3c4a5a7cffe3ef63aaa1774c6faff3c95c80 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -177,8 +177,7 @@ class _QueuedJob(object):
 
     """
     if not ops:
-      # TODO: use a better exception
-      raise Exception("No opcodes")
+      raise errors.GenericError("A job needs at least one opcode")
 
     self.queue = queue
     self.id = job_id