Make the message less scary -- Related to #1074
Merge branch 'michel_1074_disconnect' into next