Fix error reporting from Choice tasks.