Better handling of aborted tasks