Add additional check to avoid broadcasting private messages in error conditions