Revert back handle_error bypassing removed by mistake