PT-41548187 - Fix core dump found during testing