trq-1904 Fixed two seg-faults from regression.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev