Stop spam of "Entity referenced is null" messages. Fixes #358