Adding a little bit of validation