Adding some protection