From 18f50fb0c075b6902a8df568bdf57240f56ba746 Mon Sep 17 00:00:00 2001
From: Ben Bosman <ben@atmire.com>
Date: Wed, 18 Mar 2020 10:56:37 +0100
Subject: [PATCH] If the data is part of a type not yet known to Angular, the
 object is null The null object causes an exception further down the road

---
 src/app/core/data/base-response-parsing.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index 08b5d9f382..efbe838d82 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -51,13 +51,13 @@ export abstract class BaseResponseParsingService {
         return this.processArray(data, request);
       } else if (isRestDataObject(data)) {
         const object = this.deserialize(data);
-        if (isNotEmpty(data._embedded) && hasValue(object)) {
+        if (isNotEmpty(data._embedded)) {
           Object
             .keys(data._embedded)
             .filter((property) => data._embedded.hasOwnProperty(property))
             .forEach((property) => {
               const parsedObj = this.process<ObjectDomain>(data._embedded[property], request);
-              if (this.shouldDirectlyAttachEmbeds && isNotEmpty(parsedObj)) {
+              if (hasValue(object) && this.shouldDirectlyAttachEmbeds && isNotEmpty(parsedObj)) {
                   if (isRestPaginatedList(data._embedded[property])) {
                     object[property] = parsedObj;
                     object[property].page = parsedObj.page.map((obj) => this.retrieveObjectOrUrl(obj));