diff --git a/Makefile b/Makefile
index b9a6e542..8336ffe4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,8 @@ build:
 	rm -rf ./sdk-output/v2026
 	node sdk-resources/prescript.js api-specs/idn/v2026/paths
 	java -jar openapi-generator-cli.jar generate -i api-specs/idn/sailpoint-api.v2026.yaml -g typescript-axios -o sdk-output/v2026 --global-property skipFormModel=false,apiDocs=true,modelDocs=true --config sdk-resources/v2026-config.yaml --api-name-suffix V2026Api --model-name-suffix V2026
+	rm -rf ./sdk-output/generic
+	java -jar openapi-generator-cli.jar generate -i api-specs/idn/sailpoint-api.generic.yaml -g typescript-axios -o sdk-output/generic --global-property skipFormModel=false,apiDocs=true,modelDocs=true --config sdk-resources/generic-config.yaml
 
 .PHONY: test
 test:
diff --git a/sdk-output/configuration.ts b/sdk-output/configuration.ts
index 370abeac..c2d8b91e 100644
--- a/sdk-output/configuration.ts
+++ b/sdk-output/configuration.ts
@@ -250,7 +250,7 @@ export class Configuration {
       }
     } catch (error) {
       console.error("Unable to fetch access token.  Aborting.");
-      throw new Error(error);
+      throw error;
     }
   }
 
diff --git a/sdk-resources/generic-config.yaml b/sdk-resources/generic-config.yaml
index 4c580d36..cf8c6fbf 100644
--- a/sdk-resources/generic-config.yaml
+++ b/sdk-resources/generic-config.yaml
@@ -5,5 +5,5 @@ files:
     destinationFilename: package.json
 npmName: sailpoint-sdk
 npmRepository: sailpoint.com
-npmVersion: 1.6.7
+npmVersion: 1.7.22
 useSingleRequestParameter: true
\ No newline at end of file
diff --git a/sdk-resources/resources/baseApi.mustache b/sdk-resources/resources/baseApi.mustache
index 864acb9b..8bf06a9b 100644
--- a/sdk-resources/resources/baseApi.mustache
+++ b/sdk-resources/resources/baseApi.mustache
@@ -42,7 +42,7 @@ export class BaseAPI {
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
             this.configuration = configuration;
-            this.basePath = configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}|| this.basePath;
+            this.basePath = (configuration.basePath != null ? (configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}) : undefined) || this.basePath;
         }
     }
 };
diff --git a/sdk-resources/resources/common.mustache b/sdk-resources/resources/common.mustache
index ec193aa3..1718dd39 100644
--- a/sdk-resources/resources/common.mustache
+++ b/sdk-resources/resources/common.mustache
@@ -137,7 +137,9 @@ export const toPathString = function (url: URL) {
  */
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
     return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-        axiosRetry(axios, configuration.retriesConfig)
+        if (configuration?.retriesConfig) {
+            axiosRetry(axios, configuration.retriesConfig);
+        }
         const headers = {
             ...{'User-Agent':'OpenAPI-Generator/{{npmVersion}}/ts'}, 
             ...axiosArgs.axiosOptions.headers,
@@ -151,7 +153,7 @@ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxi
         }
 
         axiosArgs.axiosOptions.headers = headers
-        const axiosRequestArgs = {...axiosArgs.axiosOptions, url: (configuration?.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}} || basePath) + axiosArgs.url};
+        const axiosRequestArgs = {...axiosArgs.axiosOptions, url: ((configuration?.basePath != null ? (configuration.basePath {{#apiVersion}}+ "/{{{apiVersion}}}"{{/apiVersion}}) : undefined) || basePath) + axiosArgs.url};
         return axios.request<T, R>(axiosRequestArgs);
     };
 }