diff --git a/serviceconnector/src/createLinker/LinkerCreateStep.ts b/serviceconnector/src/createLinker/LinkerCreateStep.ts
index 684e844330..81e9e91d4f 100644
--- a/serviceconnector/src/createLinker/LinkerCreateStep.ts
+++ b/serviceconnector/src/createLinker/LinkerCreateStep.ts
@@ -3,7 +3,7 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizardExecuteStep, GenericTreeItem, nonNullProp, randomUtils } from "@microsoft/vscode-azext-utils";
+import { AzureWizardExecuteStep, GenericTreeItem, nonNullProp, nonNullValueAndProp, randomUtils } from "@microsoft/vscode-azext-utils";
 import * as vscode from 'vscode';
 import { TargetServiceTypeName } from "../../constants";
 import { createLinkerClient } from "../linkerClient";
@@ -45,11 +45,11 @@ export class LinkerCreateStep extends AzureWizardExecuteStep<ICreateLinkerContex
     private getSourceResourceId(context: ICreateLinkerContext): string {
         switch (context.targetServiceType?.type) {
             case TargetServiceTypeName.Storage:
-                return nonNullProp(nonNullProp(context, 'storageAccount'), 'id');
+                return nonNullValueAndProp(context.storageAccount, 'id');
             case TargetServiceTypeName.CosmosDB:
-                return nonNullProp(nonNullProp(context, 'databaseAccount'), 'id');
+                return nonNullValueAndProp(context.databaseAccount, 'id');
             case TargetServiceTypeName.KeyVault:
-                return nonNullProp(nonNullProp(context, 'keyVaultAccount'), 'id');
+                return nonNullValueAndProp(context.keyVaultAccount, 'id');
             default:
                 throw new Error(vscode.l10n.t('No target type found'));
         }
diff --git a/serviceconnector/src/createLinker/LinkerNameStep.ts b/serviceconnector/src/createLinker/LinkerNameStep.ts
index 83a5c4e02b..405ee0ec11 100644
--- a/serviceconnector/src/createLinker/LinkerNameStep.ts
+++ b/serviceconnector/src/createLinker/LinkerNameStep.ts
@@ -2,7 +2,7 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
-import { AzureWizardPromptStep, nonNullProp, randomUtils } from '@microsoft/vscode-azext-utils';
+import { AzureWizardPromptStep, nonNullValueAndProp, randomUtils } from '@microsoft/vscode-azext-utils';
 import * as vscode from 'vscode';
 import { ICreateLinkerContext } from './ICreateLinkerContext';
 
@@ -10,7 +10,7 @@ export class LinkerNameStep extends AzureWizardPromptStep<ICreateLinkerContext>{
     public async prompt(context: ICreateLinkerContext): Promise<void> {
         context.linkerName = await context.ui.showInputBox({
             prompt: vscode.l10n.t('Enter a name for the connection'),
-            value: nonNullProp(nonNullProp(context, 'targetServiceType'), 'name') + '_' + randomUtils.getRandomHexString(5),
+            value: nonNullValueAndProp(context.targetServiceType, 'name') + '_' + randomUtils.getRandomHexString(5),
             validateInput: this.validateInput
         });
     }