Fixing a couple of NPE in the newly added Connection Manager UI.