diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
index f24cf92c3..023436a31 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html
@@ -128,7 +128,7 @@
 								<div class="col-12 intro">
 									{{section.description}}
 								</div>
-								<div class="col-12 card" *ngIf="section.fields.length > 0">
+								<div class="col-12 card" *ngIf="section.fields?.length > 0">
 									<div class="row">
 										<div class="col-12">
 											<div *ngFor="let field of section.fields; let j=index">
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
index 6dc3f2c98..5c29afbc0 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts
@@ -158,7 +158,7 @@ export class DmpPropertiesEditorModel implements DmpPropertiesPersist {
 
 		
 		dmpBlueprint.definition.sections.forEach(section => {
-			section.fields.forEach(field => {
+			section.fields?.forEach(field => {
 				this.dmpBlueprintValues.set(field.id, new DmpBlueprintValueEditorModel(this.validationErrorModel).fromModel(
 					{
 						fieldId: field.id,