diff --git a/ChangeLog b/ChangeLog
index 1b55d53..29ff88d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/task.py:
+	  Document and change name of a method.
+
 2011-05-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/common/gstreamer.py:
diff --git a/morituri/common/task.py b/morituri/common/task.py
index 609c839..006b977 100644
--- a/morituri/common/task.py
+++ b/morituri/common/task.py
@@ -117,8 +117,7 @@ class Task(object, log.Loggable):
             self._notifyListeners('described', description)
             self.description = description
 
-    # FIXME: does not actually raise
-    def setAndRaiseException(self, exception):
+    def setExceptionAndTraceback(self, exception):
         """
         Call this to set a synthetically created exception (and not one
         that was actually raised and caught)
@@ -140,8 +139,13 @@ class Task(object, log.Loggable):
         self.exceptionMessage = line
         self.exceptionTraceback = traceback.format_exc()
         self.debug('set exception, %r' % self.exceptionMessage)
+    # FIXME: remove
+    setAndRaiseException = setExceptionAndTraceback
 
     def setException(self, exception):
+        """
+        Call this to set a caught exception on the task.
+        """
         import traceback
 
         self.exception = exception