diff --git a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellRenderer.java b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellRenderer.java
index 20a25010e..0a09d742d 100644
--- a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellRenderer.java
+++ b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableCellRenderer.java
@@ -243,6 +243,8 @@ public class SVTableCellRenderer extends JLabel
             default:
               setValue("?");
           }
+       } else {
+           setValue("");
        }
 
 
@@ -288,7 +290,9 @@ public class SVTableCellRenderer extends JLabel
      */
     private HSSFCell getCell(int row, int col) {
       HSSFRow r = st.getRow(row);
-      HSSFCell c = r.getCell((short)col);
+      HSSFCell c = null;
+      if ( r != null)
+       c = r.getCell((short)col);
       return c;
     }
 }
diff --git a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableModel.java b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableModel.java
index ada60a840..8ea268bbd 100644
--- a/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableModel.java
+++ b/src/contrib/src/org/apache/poi/hssf/contrib/view/SVTableModel.java
@@ -106,7 +106,7 @@ public class SVTableModel extends AbstractTableModel {
   }
 
   public Class getColumnClass(int c) {
-      return getValueAt(0, c).getClass();
+	return HSSFCell.class;
   }