HHH-8621 - NPE in BasicConnectionCreator