I don't think we normally use `exit` in these situations (@adamv, @jacknagel)? Looks good otherwise.