Fix some typos and only only add message to decode list if no exception was thrown