Fix to TRQ-1548 - Torque Segfault.