TRQ-2992. Fix another potential cause for a segfault.

Fix one more area that a segfault could occur.