vault: Un-nest checks

This will allow more checks later, while keeping the code flow linear.