diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/DatePickerAttributes.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/DatePickerAttributes.java
index fb07a90..8451b17 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/DatePickerAttributes.java
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/main/java/uk/gov/laa/ccms/springboot/dialect/DatePickerAttributes.java
@@ -14,6 +14,6 @@ public record DatePickerAttributes(
     String maxDate) {
 
   public boolean hasError() {
-    return !errorMessage.isEmpty();
+    return errorMessage != null && !errorMessage.isBlank();
   }
 }
diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/MoJDatePickerElementTagProcessorTest.java b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/MoJDatePickerElementTagProcessorTest.java
index 192e816..2bf11e5 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/MoJDatePickerElementTagProcessorTest.java
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/java/uk/gov/laa/ccms/springboot/dialect/MoJDatePickerElementTagProcessorTest.java
@@ -29,7 +29,16 @@ void shouldRenderGovukButton() {
                 "Please enter a valid date of birth.</p><input class=\"govuk-input moj-js-datepicker-input " +
                 "govuk-input--error\" id=\"dob\" name=\"dateOfBirth\" type=\"text\" " +
                 "aria-describedby=\"dob-hint dob-error\" value=\"2024-01-01\" autocomplete=\"off\">" +
-                "</div></div>");
+                "</div></div>")
+        .contains(
+            "<div class=\"moj-datepicker\" data-module=\"moj-date-picker\" " +
+                "data-min-date=\"2000-01-01\" data-max-date=\"2025-12-31\">" +
+                "<div class=\"govuk-form-group\"><label class=\"govuk-label\" " +
+                "for=\"dob\">Date of Birth</label><div id=\"dob-hint\" " +
+                "class=\"govuk-hint\">For example, 01/01/2000.</div><input " +
+                "class=\"govuk-input moj-js-datepicker-input\" id=\"dob\" name=\"dateOfBirth\" " +
+                "type=\"text\" aria-describedby=\"dob-hint\" value=\"2024-01-01\" " +
+                "autocomplete=\"off\"></div></div>");
 
   }
 
diff --git a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-datepicker.html b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-datepicker.html
index 43dd98e..25c0a63 100644
--- a/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-datepicker.html
+++ b/laa-ccms-spring-boot-starters/laa-ccms-spring-boot-starter-govuk-dialect/src/test/resources/templates/test-datepicker.html
@@ -16,5 +16,15 @@
         value="2024-01-01">
 </moj:datepicker>
 
+<moj:datepicker
+        id="dob"
+        name="dateOfBirth"
+        label="Date of Birth"
+        hint="For example, 01/01/2000."
+        minDate="2000-01-01"
+        maxDate="2025-12-31"
+        value="2024-01-01">
+</moj:datepicker>
+
 </body>
 </html>
\ No newline at end of file