Refined exceptions handling