Update excepteion_handler signature