added protection against world corruption, for #1521