PRD-4856 - Perform proper cleanup even when transformation fails.
Merge pull request #287 from tmorgner/master

PRD-4856 - Perform proper cleanup even when transformation fails.