1 files changed, 5 insertions, 3 deletions
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
index 44d37de36b..bed1f0748e 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
@@ -76,11 +76,13 @@ public class RowRecordsAggregate
 
     public RowRecord getRow(int rownum)
     {
+		// Row must be between 0 and 65535
+		if(rownum < 0 || rownum > 65535) {
+			throw new IllegalArgumentException("The row number must be between 0 and 65535");
+		}
 
-        // Integer integer = new Integer(rownum);
         RowRecord row = new RowRecord();
-
-        row.setRowNumber(( short ) rownum);
+        row.setRowNumber(rownum);
         return ( RowRecord ) records.get(row);
     }