Added validations

Never use `unless` with `else`. Rewrite these with the positive case first.