MODE-1821 Improved the recent changes to perform post-lock validation

Made several improvements to the recent changes that add validation
of SNS *after* locks were obtained.