Issue #2076035 by mikeryan: Validate that term names are not empty
Issue #2076035 by mikeryan: Properly check key values in saveMessage()