[2015] Corrected exeption handling