I think Matt is right here.

I think we can do better to move this check lower down.