ALM-193 simplified error flow