Perhaps now that it's a handler it should just raise an exception rather than calling sys.exit() itself.