fixed null smileys
Merge branch 'jim-comment'
merged