Allow done function to return error and return value object #2626