Eliminate double save and stop using exceptions for flow control
Merge pull request #433 from projecthydra/no_exception_flow_control

Eliminate double save and stop using exceptions for flow control