Added some small validation