diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java
index 182b4e7b6..c63e5a2be 100644
--- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java	
+++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/DatabaseUtilities.java	
@@ -158,8 +158,10 @@ public class DatabaseUtilities
 
 		for (int i = 1; i < (numColumns + 1); i++)
 		{
-		    row.addElement(new TD(results.getString(i).replaceAll(" ",
-			    "&nbsp;")));
+			String str = results.getString(i);
+			if (str == null)
+				str = "";
+		    row.addElement(new TD(str.replaceAll(" ", "&nbsp;")));
 		}
 
 		t.addElement(row);