diff --git a/Makefile b/Makefile
index 4df0b76..773bef9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-UTIL_VERSION            := 0.5.24
+UTIL_VERSION            := 0.5.25
 UTIL_NAME               := codeplag
 PWD                     := $(shell pwd)
 
diff --git a/src/templates/general.templ b/src/templates/general.templ
index 2644cfe..21f297d 100644
--- a/src/templates/general.templ
+++ b/src/templates/general.templ
@@ -117,27 +117,29 @@
                     <th>{{ _("Similarity") }}, %</th>
                 </tr>
                 {% for first_head in same_parts_of_second %}
-                {% set second_head = same_parts_of_second[first_head][0].name %}
-                <tr class="table__row">
-                    <td rowspan="{{ len(same_parts_of_second[first_head]) }}">{{ first_head }}</td>
-                    <td>{{ second_head }}</td>
-                    {% set head_percent = same_parts_of_second[first_head].pop(0).percent %}
-                    {% if head_percent > threshold %}
-                        <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ head_percent }}</td>
-                    {% else %}
-                        <td>{{ head_percent }}</td>
-                    {% endif %}
-                </tr>
-                {% for same_head_info in same_parts_of_second[first_head] %}
-                <tr class="table__row">
-                    <td>{{ same_head_info.name }}</td>
-                    {% if same_head_info.percent > threshold %}
-                        <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ same_head_info.percent }}</td>
-                    {% else %}
-                        <td>{{ same_head_info.percent }}</td>
+                    {% if same_parts_of_second[first_head] %}
+                        {% set second_head = same_parts_of_second[first_head][0].name %}
+                        <tr class="table__row">
+                            <td rowspan="{{ len(same_parts_of_second[first_head]) }}">{{ first_head }}</td>
+                            <td>{{ second_head }}</td>
+                            {% set head_percent = same_parts_of_second[first_head].pop(0).percent %}
+                            {% if head_percent > threshold %}
+                                <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ head_percent }}</td>
+                            {% else %}
+                                <td>{{ head_percent }}</td>
+                            {% endif %}
+                        </tr>
+                        {% for same_head_info in same_parts_of_second[first_head] %}
+                        <tr class="table__row">
+                            <td>{{ same_head_info.name }}</td>
+                            {% if same_head_info.percent > threshold %}
+                                <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ same_head_info.percent }}</td>
+                            {% else %}
+                                <td>{{ same_head_info.percent }}</td>
+                            {% endif %}
+                        </tr>
+                        {% endfor %}
                     {% endif %}
-                </tr>
-                {% endfor %}
                 {% endfor %}
             </table>
             <table align="center" style="display: inline-table;">
@@ -148,27 +150,29 @@
                     <th>{{ _("Similarity") }}, %</th>
                 </tr>
                 {% for first_head in same_parts_of_first %}
-                {% set second_head = same_parts_of_first[first_head][0].name %}
-                <tr class="table__row">
-                    <td rowspan="{{ len(same_parts_of_first[first_head]) }}">{{ first_head }}</td>
-                    <td>{{ second_head }}</td>
-                    {% set head_percent = same_parts_of_first[first_head].pop(0).percent %}
-                    {% if head_percent > threshold %}
-                        <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ head_percent }}</td>
-                    {% else %}
-                        <td>{{ head_percent }}</td>
-                    {% endif %}
-                </tr>
-                {% for same_head_info in same_parts_of_first[first_head] %}
-                <tr class="table__row">
-                    <td>{{ same_head_info.name }}</td>
-                    {% if same_head_info.percent > threshold %}
-                        <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ same_head_info.percent }}</td>
-                    {% else %}
-                        <td>{{ same_head_info.percent }}</td>
+                    {% if same_parts_of_first[first_head] %}
+                        {% set second_head = same_parts_of_first[first_head][0].name %}
+                        <tr class="table__row">
+                            <td rowspan="{{ len(same_parts_of_first[first_head]) }}">{{ first_head }}</td>
+                            <td>{{ second_head }}</td>
+                            {% set head_percent = same_parts_of_first[first_head].pop(0).percent %}
+                            {% if head_percent > threshold %}
+                                <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ head_percent }}</td>
+                            {% else %}
+                                <td>{{ head_percent }}</td>
+                            {% endif %}
+                        </tr>
+                        {% for same_head_info in same_parts_of_first[first_head] %}
+                        <tr class="table__row">
+                            <td>{{ same_head_info.name }}</td>
+                            {% if same_head_info.percent > threshold %}
+                                <td style="background-color: rgb(255, 200, 200); font-weight: bold;">{{ same_head_info.percent }}</td>
+                            {% else %}
+                                <td>{{ same_head_info.percent }}</td>
+                            {% endif %}
+                        </tr>
+                        {% endfor %}
                     {% endif %}
-                </tr>
-                {% endfor %}
                 {% endfor %}
             </table>
             </div>