diff --git a/.gitignore b/.gitignore
index 4f10c2de5..0bcf70f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 node_modules/
 dist/
 .vscode/
+.vs/
 package-lock.json
 tmpoutput
 .history
diff --git a/src/plugins/azgenerator/CodeModelAzImpl.ts b/src/plugins/azgenerator/CodeModelAzImpl.ts
index 2b2168e1c..58d04b389 100644
--- a/src/plugins/azgenerator/CodeModelAzImpl.ts
+++ b/src/plugins/azgenerator/CodeModelAzImpl.ts
@@ -615,8 +615,7 @@ export class CodeModelCliImpl implements CodeModelAz {
     }
 
     public get Command_GetOriginalOperation(): any {
-        let oriOp = this.Command.extensions['cli-poly-as-resource-original-operation'];
-        return oriOp;
+        return this.Command.extensions?.['cli-poly-as-resource-original-operation'];
     }
 
     public get Command_IsLongRun(): boolean {
@@ -742,8 +741,7 @@ export class CodeModelCliImpl implements CodeModelAz {
     }
 
     public get Method_GetOriginalOperation(): any {
-        let oriOp = this.Method.extensions['cli-poly-as-resource-original-operation'];
-        return oriOp;
+        return this.Method.extensions?.['cli-poly-as-resource-original-operation'];
     }
     //=================================================================================================================
     // Methods Parameters.
diff --git a/src/plugins/merger.ts b/src/plugins/merger.ts
index 376a993f3..4ab96a5d3 100644
--- a/src/plugins/merger.ts
+++ b/src/plugins/merger.ts
@@ -21,7 +21,7 @@ export class Merger {
         this.codeModel.operationGroups.forEach(operationGroup => {
             let operations = operationGroup.operations;
             operationGroup.operations.forEach(operation => {
-                if(!isNullOrUndefined(operation.extensions['cli-operations'])) {
+                if (!isNullOrUndefined(operation.extensions) && !isNullOrUndefined(operation.extensions['cli-operations'])) {
                     operations = operations.concat(operation.extensions['cli-operations']);
                 }
             });