Enhance disconnect message - Fix #333