- Fix NPE when removing connection from the pool