Fixed excption handling for 10.5