Fix for when Listener in ConnectionManager is null