diff --git a/starter-code/4-database/passoff/server/DatabaseTests.java b/starter-code/4-database/passoff/server/DatabaseTests.java
index 78268da..7495157 100644
--- a/starter-code/4-database/passoff/server/DatabaseTests.java
+++ b/starter-code/4-database/passoff/server/DatabaseTests.java
@@ -130,9 +130,10 @@ code for any endpoint which no longer can do what it needs to do (which for this
                 TestResult result = operation.get();
                 Assertions.assertEquals(500, serverFacade.getStatusCode(),
                         "Server response code was not 500 Internal Error for " + operationName);
-                Assertions.assertNotNull(result.getMessage(), "Invalid Request didn't return an error message for " + operationName);
-                Assertions.assertTrue(result.getMessage().toLowerCase(Locale.ROOT).contains("error"),
-                        "Error message didn't contain the word \"Error\" for " + operationName);
+                String errorMessage = result.getMessage();
+                Assertions.assertNotNull(errorMessage, "Invalid Request didn't return an error message for " + operationName);
+                Assertions.assertTrue(errorMessage.toLowerCase(Locale.ROOT).contains("error"),
+                        String.format("Error message didn't contain the word \"Error\" for %s. Error message: \"%s\"", operationName, errorMessage));
             }
         } finally {
             Method loadFromResources = databaseManagerClass.getDeclaredMethod("loadPropertiesFromResources");