Exception handler mockup improvements