Fixing empty messages incorrectly shown