Timob 13359 3 1 x

Backport of changes made to allow for alternate uses of error handling properties.