Make entity events safe