Added custom error strategy