Sure, I can change it to be not a catchall in another PR.