refactor: try to reduce nesting with guard clauses

- As per: #2597 (comment)
- Reduce nesting by refactoring to use guard clauses
- Abstract commonly used guard clause into it's own function.