Fixing issue #2047743 - empty addresses causing database errors.