Ensure tasks are marked as finished no matter what refs #2672