[2015] Corrected exception handling