Fixed #1728
Fixed weird messages when messages not given
Merge branch 'master' into workshop