Added message punctuation + revert when setting empty tenant name