First run at a possible fix for NPE disconn bug