LPS-36287

Pull request # 1 of many. I only dealt with NoSuchUserExceptions this time around so you may see some other patterns I skipped over.

Please leave the ticket open.

Thanks!