Fix ugliness with async checking in router