diff --git a/src/models/response/baseResponse.ts b/src/models/response/baseResponse.ts
index d773a7cfb6..645689f8f8 100644
--- a/src/models/response/baseResponse.ts
+++ b/src/models/response/baseResponse.ts
@@ -11,7 +11,8 @@ export abstract class BaseResponse {
         }
         if (response == null && this.response != null) {
             response = this.response;
-        } else {
+        }
+        if (response == null) {
             return null;
         }
         if (!exactName && response[propertyName] === undefined) {