diff --git a/src/models/response/baseResponse.ts b/src/models/response/baseResponse.ts
index b4478bff3d..d773a7cfb6 100644
--- a/src/models/response/baseResponse.ts
+++ b/src/models/response/baseResponse.ts
@@ -9,8 +9,10 @@ export abstract class BaseResponse {
         if (propertyName == null || propertyName === '') {
             throw new Error('propertyName must not be null/empty.');
         }
-        if (response == null) {
+        if (response == null && this.response != null) {
             response = this.response;
+        } else {
+            return null;
         }
         if (!exactName && response[propertyName] === undefined) {
             let otherCasePropertyName: string = null;
diff --git a/src/models/response/errorResponse.ts b/src/models/response/errorResponse.ts
index d28f6a2e02..fcce9f93d4 100644
--- a/src/models/response/errorResponse.ts
+++ b/src/models/response/errorResponse.ts
@@ -8,11 +8,13 @@ export class ErrorResponse extends BaseResponse {
     constructor(response: any, status: number, identityResponse?: boolean) {
         super(response);
         let errorModel = null;
-        const responseErrorModel = this.getResponseProperty('ErrorModel');
-        if (responseErrorModel && identityResponse && response) {
-            errorModel = responseErrorModel;
-        } else if (response) {
-            errorModel = response;
+        if (response != null) {
+            const responseErrorModel = this.getResponseProperty('ErrorModel');
+            if (responseErrorModel && identityResponse) {
+                errorModel = responseErrorModel;
+            } else {
+                errorModel = response;
+            }
         }
 
         if (errorModel) {