Fix bug where folder creation could fail if personal namespace contained more than one entry (#5403)

+ small code improvements