Improve exceptions waterfall