Basvi-Fix-UATNBNXR018 - 2nd Revert( validation)

UATNBNXR018 - 2nd Revert(Address validation only)