Fixed first exception handling