Avoid calling to_s on nil for emoticon set ids
Merge branch 'hotfix/fix-default-emoticon-set'