Fix for crash in master when users disconnect