I think we'd better fix this instead of wrapping everything in an exception handler.