Try to improve error handling within tasks