Add protection against potential world corruption