Add additional check to avoid broadcasting private messages in error conditions
Merge commit 'e7c2e61' into merge2