TRQ-2992. Remove some more potential causes for this crash.

I identified some more unsafe coding that happened around the time this crash appeared.
Hopefully correcting this will fix this crash.