handles empty short names and void the old ones instead of saving the empty ones
Merge pull request #207 from NilsEckelt/master

Solving #TRUNK-3445