better error shunting