diff --git a/starter-code/4-database/passoff/server/DatabaseTests.java b/starter-code/4-database/passoff/server/DatabaseTests.java
index 7495157..6c4c267 100644
--- a/starter-code/4-database/passoff/server/DatabaseTests.java
+++ b/starter-code/4-database/passoff/server/DatabaseTests.java
@@ -166,8 +166,10 @@ private void checkTableForPassword(String table, Connection connection) throws S
             while (rs.next()) {
                 for (int i = 1; i <= columns; i++) {
                     String value = rs.getString(i);
-                    Assertions.assertFalse(value.contains(TEST_USER.getPassword()),
+                    if (value != null){
+                        Assertions.assertFalse(value.contains(TEST_USER.getPassword()),
                             "Found clear text password in database");
+                    }
                 }
             }
         }