Add some additional protection