[V1S3 US7] : Additional work on exception during saving.