Adding validation with useful messages