LPS-36894 Changes in NoSuchFolderException handling. NOT TO MERGE DIRECTLY!