Correct exception management