issue 1250

Fixes issue #1250 in already release RC.

Also merging in the handling of bad (truncated) polygons as they exist already on RC.