Fixes incorrect handling of terminator blocks that results in segmentation faults. Backported from upstream 1.6.2.
Fixes incorrect handling of terminator blocks that results in segmentation faults. Backported from upstream 1.6.2.