DEBUG wrap more exceptions