Empty stream message improvement