I used it to respect the behavior the original code had. Notice there's a few empty returns on the removed code. I agree raising the original exception is a better option, but just wanted to reorg, not change logic. I'll be happy to fix that if you're down with just plain raising.