NA SM: fix potential issue where unresolved address would get polled
NA SM: fix potential issue where unresolved address would get polled

mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury,mercury-hpc/mercury