From 3d323615e4aa745930cdbd42d009ff98bccde2d8 Mon Sep 17 00:00:00 2001
From: apapachristou <apapachristou@cite.gr>
Date: Fri, 18 Sep 2020 18:53:05 +0300
Subject: [PATCH] Adds check for broken dataset template

---
 .../admin/field-data/field-data-option-editor-model.ts    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model.ts
index 83ab2a55a..5b0067954 100644
--- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model.ts
+++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/field-data-option-editor-model.ts
@@ -16,9 +16,11 @@ export class FieldDataOptionEditorModel extends FieldDataEditorModel<FieldDataOp
 	}
 
 	fromModel(item: FieldDataOption): FieldDataOptionEditorModel {
-		this.label = item.label;
-		this.value = item.value;
-		this.source = item.source;
+		if (item) {
+			this.label = item.label;
+			this.value = item.value;
+			this.source = item.source;
+		}
 		return this;
 	}
 }