diff --git a/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java b/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java
index 7e0b261c..04eecce4 100644
--- a/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java
+++ b/projects/samskivert/src/java/com/samskivert/velocity/DataTool.java
@@ -26,7 +26,7 @@ public class DataTool
      */
     public Object get (Object array, int index)
     {
-        return Array.get(array, index);
+        return (array == null) ? null : Array.get(array, index);
     }
 
     /**
@@ -34,7 +34,7 @@ public class DataTool
      */
     public int length (Object array)
     {
-        return Array.getLength(array);
+        return (array == null) ? 0 : Array.getLength(array);
     }
 
     /**