Fixes a crash that could happen on game load or while exploring the field. Big thanks to everyone who reported and helped test - this was tough to track down and get right!
