1 files changed, 10 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index b4d79f304c..29dc52a9a6 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -2954,15 +2954,23 @@ public class Table extends AbstractSelect implements Action.Container,
             // (row caches emptied by other event)
             if (!containerChangeToBeRendered) {
                 Integer value = (Integer) variables.get("reqfirstrow");
+                int tableSize = size();
                 if (value != null) {
                     reqFirstRowToPaint = value.intValue();
+                    // Sanity check
+                    if (reqFirstRowToPaint < 0) {
+                        reqFirstRowToPaint = -1;
+                    }
+                    if (reqFirstRowToPaint >= tableSize) {
+                        reqFirstRowToPaint = tableSize - 1;
+                    }
                 }
                 value = (Integer) variables.get("reqrows");
                 if (value != null) {
                     reqRowsToPaint = value.intValue();
                     // sanity check
-                    if (reqFirstRowToPaint + reqRowsToPaint > size()) {
-                        reqRowsToPaint = size() - reqFirstRowToPaint;
+                    if (reqFirstRowToPaint + reqRowsToPaint > tableSize) {
+                        reqRowsToPaint = tableSize - reqFirstRowToPaint;
                     }
                 }
             }