Broke everything fixing error paths