Added some guards