diff --git a/lib/jqueue.py b/lib/jqueue.py
index 2c2a5fab25576468e10724ecee0c2afceccc4fd5..38b13b73b66514970ebaa41c6d7b34b3f8c807ea 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -51,7 +51,7 @@ from ganeti import rpc
 JOBQUEUE_THREADS = 25
 
 
-class CancelJob:
+class CancelJob(Exception):
   """Special exception to cancel a job.
 
   """