This will allow more checks later, while keeping the code flow linear.
Migrated from D7299 (view on Phabricator)