Make validations even more bullet-proof