diff --git a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
index 45c034cac..913dfe277 100644
--- a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
+++ b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/creatibutors.html
@@ -3,6 +3,7 @@
     Copyright (C) 2020 Northwestern University.
     Copyright (C) 2021 Graz University of Technology.
     Copyright (C) 2021-2022 New York University.
+    Copyright (C) 2025 KTH Royal Institute of Technology.
 
     Invenio RDM Records is free software; you can redistribute it and/or modify
     it under the terms of the MIT License; see LICENSE file for more details.
@@ -15,11 +16,11 @@
     {% for scheme, details in config.APP_RDM_IDENTIFIER_SCHEMES_UI.items() %}
       {% for identifier in creatibutor.person_or_org.identifiers|selectattr("scheme", "equalto", scheme) %}
         {% set identifier_found.value = True %}
-        <a href="{{ identifier.identifier|pid_url(scheme) }}" 
-           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}" 
+        <a href="{{ identifier.identifier|pid_url(scheme) }}"
+           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}"
            title="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}">
-          <img class="ml-5 inline-id-icon" 
-               src="{{ url_for('static', filename=details.icon) }}" 
+          <img class="ml-5 inline-id-icon"
+               src="{{ url_for('static', filename=details.icon) }}"
                alt="{{ details.label }} icon"/>
         </a>
       {% endfor %}
@@ -39,7 +40,7 @@
 
 
 {% macro show_creatibutors(creatibutors, show_affiliations=False, type="creators", show_role=False) %}
-  {% for creatibutor in creatibutors %}
+  {% for creatibutor in creatibutors if creatibutor.person_or_org and creatibutor.person_or_org.name %}
   <li class="creatibutor-wrap separated">
     <a class="ui creatibutor-link"
       {% if show_affiliations and creatibutor.affiliations %}
@@ -85,11 +86,11 @@
     {% for affiliation in affiliations %}
     <li>
       {{ affiliation[0] }}.
-  
+
       {% if affiliation[2] %}
         {% set scheme, identifier = (affiliation[2].split(':', 1) if ':' in affiliation[2] else ('ror', affiliation[2])) %}
         {% set scheme_config = config.APP_RDM_IDENTIFIER_SCHEMES_UI.get(scheme) %}
-        
+
         {% if scheme_config %}
           <a class="no-text-decoration"
              href="{{ scheme_config.url_prefix + identifier }}"
@@ -103,11 +104,11 @@
           </a>
         {% endif %}
       {% endif %}
-  
+
       {{ affiliation[1] }}
     </li>
   {% endfor %}
-  
+
     </ul>
 </section>
 {% endmacro %}
diff --git a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
index 63fce52aa..7fba802f8 100644
--- a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
+++ b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
@@ -1,6 +1,7 @@
 {#
   Copyright (C) 2020-2025 CERN.
   Copyright (C) 2024 Northwestern University.
+  Copyright (C) 2024-2025 KTH Royal Institute of Technology.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
   it under the terms of the MIT License; see LICENSE file for more details.
@@ -59,18 +60,25 @@
 
 {% macro show_add_descriptions(add_descriptions) %}
   {% for add_description in add_descriptions %}
-    <section id="additional-description-{{ loop.index }}" class="rel-mt-2 rich-input-content"
-             aria-label="{{ _( add_description.type.title_l10n ) }}">
-      <h2>{{ add_description.type.title_l10n }} <span
-        class="text-muted language">{{ '(' + add_description.lang.title_l10n + ')' if add_description.lang }}</span>
+    {% set desc_type_defined = add_description.type is defined %}
+    {% set desc_text = add_description.description|default('') %}
+    <section
+      id="additional-description-{{ loop.index }}"
+      class="rel-mt-2 rich-input-content"
+      aria-label="{{ (add_description.type.title_l10n if desc_type_defined else _('Missing description type!')) }}"
+    >
+      <h2>
+        {{ add_description.type.title_l10n if desc_type_defined else _('Missing description type!') }}
+        <span class="text-muted language">
+          {{ '(' ~ add_description.lang.title_l10n ~ ')' if add_description.lang is defined else '' }}
+        </span>
       </h2>
-
-      {% if add_description.type.id == "notes" %}
+      {% if desc_type_defined and add_description.type.id == "notes" %}
         <div class="ui message warning">
-          {{ add_description.description | sanitize_html() | safe }}
+          {{ desc_text | sanitize_html() | safe }}
         </div>
       {% else %}
-        {{ add_description.description | sanitize_html() | safe }}
+        {{ desc_text | sanitize_html() | safe }}
       {% endif %}
     </section>
   {% endfor %}
@@ -79,10 +87,11 @@ <h2>{{ add_description.type.title_l10n }} <span
 
 {% macro show_dates(dates) %}
   {% for date in dates %}
-    <dt class="ui tiny header">{{ date.type.title_l10n }}</dt>
+    {% set date_type_title = date.type.title_l10n if (date.type is defined and date.type.title_l10n is defined) else _('Unknown date type') %}
+    <dt class="ui tiny header">{{ date_type_title }}</dt>
     <dd>
-      <div>{{ date.date }}</div>
-      <div class="text-muted">{{ date.description }}</div>
+      <div>{{ date.date|default('') }}</div>
+      <div class="text-muted">{{ date.description|default('') }}</div>
     </dd>
   {% endfor %}
 {% endmacro %}
@@ -103,7 +112,7 @@ <h2>{{ add_description.type.title_l10n }} <span
       {% if item.award.acronym %}
         {{ item.award.acronym }} –
       {% endif %}
-      
+
       {%- if item.award.title_l10n -%}
         {{ item.award.title_l10n }}
       {%- endif -%}
@@ -130,15 +139,13 @@ <h2>{{ add_description.type.title_l10n }} <span
 {% macro show_references(references) %}
   <ul class="ui bulleted list details-list">
     {% for reference in references %}
-      {% set reference_string = reference.reference %}
-      {% if 'identifier' in reference %}
-        {% if 'scheme' in reference %}
+      {% set reference_string = reference.reference|default('') %}
+      {% if reference.identifier is defined and reference.identifier %}
+        {% if reference.scheme is defined and reference.scheme %}
           {% set reference_scheme = reference.scheme | get_scheme_label %}
-          {% set reference_string = reference_string + ' ( ' + reference_scheme +
-          ' - ' + reference.identifier + ' )' %}
+          {% set reference_string = reference_string ~ ' (' ~ reference_scheme ~ ' - ' ~ reference.identifier ~ ')' %}
         {% else %}
-          {% set reference_string = reference_string + ' ( ' + reference.identifier +
-          ' )' %}
+          {% set reference_string = reference_string ~ ' (' ~ reference.identifier ~ ')' %}
         {% endif %}
       {% endif %}
       <li class="item">{{ reference_string | urlize }}</li>
@@ -150,20 +157,23 @@ <h2>{{ add_description.type.title_l10n }} <span
 {% macro _identifiers_for_group(related_identifiers) %}
   {% for identifier in related_identifiers %}
     <dd>
-      {% if identifier.resource_type is defined %}
+      {% if identifier.resource_type is defined and identifier.resource_type.title_l10n is defined %}
         {{ identifier.resource_type.title_l10n }}:
       {% endif %}
 
-      {% set url = identifier.identifier|pid_url %}
+      {% set ident_val = identifier.identifier|default('') %}
+      {% set url = ident_val|pid_url %}
       {% if url %}
         <a href="{{ url }}" target="_blank" title="{{ _('Opens in new tab') }}">
-          {{ identifier.identifier }}
+          {{ ident_val }}
         </a>
       {% else %}
-        {{ identifier.identifier }}
+        {{ ident_val }}
       {% endif %}
 
-      {{ ' (' + identifier.scheme | get_scheme_label + ')' }}
+      {% if identifier.scheme is defined and identifier.scheme %}
+        {{ ' (' ~ (identifier.scheme|get_scheme_label) ~ ')' }}
+      {% endif %}
     </dd>
   {% endfor %}
 {% endmacro %}
@@ -171,7 +181,7 @@ <h2>{{ add_description.type.title_l10n }} <span
 
 {% macro show_related_identifiers(related_identifiers) %}
   <dl class="details-list">
-    {%- for group in related_identifiers | groupby('relation_type.title_l10n') %}
+    {%- for group in (related_identifiers|selectattr("relation_type","defined")|list) | groupby('relation_type.title_l10n') %}
       <dt class="ui tiny header">{{ group.grouper }}</dt>
       {{ _identifiers_for_group(group.list) }}
     {%- endfor %}