diff --git a/webapp/src/freemarker/ext/dump/BaseDumpDirective.java b/webapp/src/freemarker/ext/dump/BaseDumpDirective.java
index 17eaacfcb..937cd7f53 100644
--- a/webapp/src/freemarker/ext/dump/BaseDumpDirective.java
+++ b/webapp/src/freemarker/ext/dump/BaseDumpDirective.java
@@ -82,8 +82,8 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
     }
 
     enum Value {
-        NULL("<null>"),
-        UNDEFINED("<undefined>");
+        NULL("[null]"),
+        UNDEFINED("[undefined]");
     
         private final String value;
         
@@ -156,7 +156,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
         Map<String, Object> value = new HashMap<String, Object>();
         
         if (model == null) {
-            value.put(Key.VALUE.toString(), Value.UNDEFINED);
+            value.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
 
         // TemplateMethodModel and TemplateDirectiveModel objects can only be
         // included in the data model at the top level.
@@ -228,7 +228,7 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
                 map.putAll( getTemplateModelDump( (TemplateModel)model ) );
             }
         } else {
-            map.put(Key.VALUE.toString(), Value.NULL);
+            map.put(Key.VALUE.toString(), Value.NULL.toString());
         }
         
         return map;
diff --git a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
index 98195738e..1178ac9c3 100644
--- a/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
+++ b/webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
@@ -81,7 +81,7 @@ public class DumpDirectiveTest {
         Map<String, Object> dataModel = new HashMap<String, Object>();
         
         Map<String, Object> expectedDumpValue = new HashMap<String, Object>();
-        expectedDumpValue.put(Key.VALUE.toString(), Value.UNDEFINED);
+        expectedDumpValue.put(Key.VALUE.toString(), Value.UNDEFINED.toString());
 
         Map<String, Object> expectedDump = new HashMap<String, Object>();
         expectedDump.put(varName, expectedDumpValue);
@@ -1199,7 +1199,7 @@ public class DumpDirectiveTest {
             propertiesExpectedDump.put("nickname", nicknameExpectedDump);
     
             Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
-            middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL);
+            middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
             propertiesExpectedDump.put("middleName", middleNameExpectedDump);
             
             Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
@@ -1286,7 +1286,7 @@ public class DumpDirectiveTest {
         Map<String, Object> expectedDump = new HashMap<String, Object>();
 
         Map<String, Object> supervisorExpectedDump = new HashMap<String, Object>();
-        supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL);
+        supervisorExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
         
         SortedMap<String, Object> propertiesExpectedDump = new TreeMap<String, Object>();
         
@@ -1318,7 +1318,7 @@ public class DumpDirectiveTest {
             propertiesExpectedDump.put("nickname", nicknameExpectedDump);
         
             Map<String, Object> middleNameExpectedDump = new HashMap<String, Object>();
-            middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL);
+            middleNameExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
             propertiesExpectedDump.put("middleName", middleNameExpectedDump);
               
             Map<String, Object> marriedExpectedDump = new HashMap<String, Object>();
@@ -1343,7 +1343,7 @@ public class DumpDirectiveTest {
             propertiesExpectedDump.put("favoriteColors", favoriteColorsExpectedDump);
             
 //            Map<String, Object> degreesExpectedDump = new HashMap<String, Object>();
-//            degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL);
+//            degreesExpectedDump.put(Key.VALUE.toString(), Value.NULL.toString());
 //            propertiesExpectedDump.put("degrees", degreesExpectedDump);            
         }
         expectedDump.put(Key.PROPERTIES.toString(), propertiesExpectedDump);