--- src/contrib/src/org/apache/poi/hssf/contrib/view/SVRowHeader.java	(revision 629569)
+++ src/contrib/src/org/apache/poi/hssf/contrib/view/SVRowHeader.java	(working copy)
@@ -73,7 +73,13 @@ 
     public Component getListCellRendererComponent( JList list,
            Object value, int index, boolean isSelected, boolean cellHasFocus) {
       Dimension d = getPreferredSize();
-      int rowHeight = (int)sheet.getRow(index).getHeightInPoints();
+      HSSFRow row = sheet.getRow(index);
+      int rowHeight;
+      if(row == null) {
+    	  rowHeight = (int)sheet.getDefaultRowHeightInPoints();
+      } else {
+    	  rowHeight = (int)row.getHeightInPoints();
+      }
       d.height = rowHeight+extraHeight;
       setPreferredSize(d);
       setText((value == null) ? "" : value.toString());