Fix production crash caused by a name longer than 30 chars

Maybe trailing blanks?
Merge pull request #1406 from RickMohr/tweak-migration

Fix production crash caused by a name longer than 30 chars