potential null pointer if there are no synonyms
another potential null pointer if there are no synonyms
Merge branch 'master' of https://github.com/projectdanube/xdi2.git