diff --git a/config/mariadb/initdb.d/init.sql b/config/mariadb/initdb.d/init.sql
index 8cfeabee764ee951fe8b9291165b5b110fd68467..c992aa03d832ef98c6fd9d90fd61ed3f0db20a54 100644
--- a/config/mariadb/initdb.d/init.sql
+++ b/config/mariadb/initdb.d/init.sql
@@ -1,4 +1,4 @@
-CREATE DATABASE dev_eclipse_eca;
+CREATE DATABASE IF NOT EXISTS dev_eclipse_eca;
 USE dev_eclipse_eca;
 
 CREATE TABLE IF NOT EXISTS `CommitValidationMessage` (
diff --git a/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java b/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java
index 48903cc7f687d0be3f837ce1b5955ea01fd14687..8fe1a05f106e0fec523b9ec9970de162f75849c6 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/resource/StatusResource.java
@@ -50,6 +50,7 @@ import jakarta.ws.rs.core.UriInfo;
 public class StatusResource extends CommonResource {
 
     // parameter names for the status error page
+    private static final String COMMIT_STATUSES_PARAMETER = "statuses";
     private static final String INCLUDE_INSTALL_LINK_PARAMETER = "includeInstallLink";
     private static final String MESSAGE_PARAMETER = "message";
     private static final String PULL_REQUEST_NUMBER_PARAMETER = "pullRequestNumber";
@@ -106,7 +107,7 @@ public class StatusResource extends CommonResource {
         return Response
                 .ok()
                 .entity(statusUiTemplate
-                        .data("statuses", statuses)
+                        .data(COMMIT_STATUSES_PARAMETER, statuses)
                         .data(PULL_REQUEST_NUMBER_PARAMETER, null)
                         .data("fullRepoName", null)
                         .data("project", ps.isEmpty() ? null : ps.get(0))
@@ -183,7 +184,7 @@ public class StatusResource extends CommonResource {
             return Response
                     .ok()
                     .entity(statusUiTemplate
-                            .data("statuses", statuses)
+                            .data(COMMIT_STATUSES_PARAMETER, statuses)
                             .data(PULL_REQUEST_NUMBER_PARAMETER, prNo)
                             .data("fullRepoName", repoFullName)
                             .data("project", ps.isEmpty() ? null : ps.get(0))
diff --git a/src/main/resources/templates/simple_fingerprint_ui.html b/src/main/resources/templates/simple_fingerprint_ui.html
index 7d8b0b08e8677e93d4abb12d1a3a0240e93aa162..3b82037a3a86b874220ab76a70ef5bee7f964097 100644
--- a/src/main/resources/templates/simple_fingerprint_ui.html
+++ b/src/main/resources/templates/simple_fingerprint_ui.html
@@ -1,4 +1,4 @@
-{#eclipse_base title='Git ECA Validation'}
+{#eclipse_base title='Git ECA Validation' _unisolated}
 {#precontent}
 {#include eclipse_breadcrumb}{/}
 {|<style>
@@ -41,7 +41,7 @@
       <h1>Git ECA Validation Status</h1>
       <div class="row">
         <div class="col-md-24 margin-bottom-20">
-          {#if (statuses.0.estimatedLoc ne null && statuses.0.estimatedLoc gt 1000) || statuses.0.provider == ProviderType:GITLAB}
+          {#if !statuses.isEmpty && ((statuses.0.estimatedLoc ne null && statuses.0.estimatedLoc gt 1000) || statuses.0.provider == ProviderType:GITLAB)}
           <div class="alert alert-info">
             <p>
               <strong>Eclipse Intellectual Property Management:</strong>