CAPX-93 | Removed deletion of mapper entity on error