Adding some simple validation