Adding some isset checks