Needed to flush before attempting to update step execution, then catch and attempt rollback on CommitFailedException.