diff --git a/ClosedXML/Excel/Ranges/XLRange.cs b/ClosedXML/Excel/Ranges/XLRange.cs
index 6e8f90c..b9d45ab 100644
--- a/ClosedXML/Excel/Ranges/XLRange.cs
+++ b/ClosedXML/Excel/Ranges/XLRange.cs
@@ -659,14 +659,15 @@
 
         public XLRangeRow Row(Int32 row)
         {
-            if (row <= 0 || row > XLHelper.MaxRowNumber)
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}", XLHelper.MaxRowNumber));
+            if (row <= 0 || row > XLHelper.MaxRowNumber + RangeAddress.FirstAddress.RowNumber - 1)
+                throw new ArgumentOutOfRangeException(nameof(row), String.Format("Row number must be between 1 and {0}", XLHelper.MaxRowNumber + RangeAddress.FirstAddress.RowNumber - 1));
 
             var firstCellAddress = new XLAddress(Worksheet,
                                                  RangeAddress.FirstAddress.RowNumber + row - 1,
                                                  RangeAddress.FirstAddress.ColumnNumber,
                                                  false,
                                                  false);
+
             var lastCellAddress = new XLAddress(Worksheet,
                                                 RangeAddress.FirstAddress.RowNumber + row - 1,
                                                 RangeAddress.LastAddress.ColumnNumber,
@@ -677,8 +678,8 @@
 
         public virtual XLRangeColumn Column(Int32 columnNumber)
         {
-            if (columnNumber <= 0 || columnNumber > XLHelper.MaxColumnNumber)
-                throw new IndexOutOfRangeException(String.Format("Column number must be between 1 and {0}", XLHelper.MaxColumnNumber));
+            if (columnNumber <= 0 || columnNumber > XLHelper.MaxColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1)
+                throw new ArgumentOutOfRangeException(nameof(columnNumber), String.Format("Column number must be between 1 and {0}", XLHelper.MaxColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1));
 
             var firstCellAddress = new XLAddress(Worksheet,
                                                  RangeAddress.FirstAddress.RowNumber,
diff --git a/ClosedXML/Excel/Tables/XLTableRange.cs b/ClosedXML/Excel/Tables/XLTableRange.cs
index 24c30ab..dc17f8b 100644
--- a/ClosedXML/Excel/Tables/XLTableRange.cs
+++ b/ClosedXML/Excel/Tables/XLTableRange.cs
@@ -123,10 +123,12 @@
         }
         public new XLTableRow Row(int row)
         {
-            if (row <= 0 || row > XLHelper.MaxRowNumber)
+            if (row <= 0 || row > XLHelper.MaxRowNumber + RangeAddress.FirstAddress.RowNumber - 1)
             {
-                throw new IndexOutOfRangeException(String.Format("Row number must be between 1 and {0}",
-                                                                 XLHelper.MaxRowNumber));
+                throw new ArgumentOutOfRangeException(
+                    nameof(row),
+                    String.Format("Row number must be between 1 and {0}", XLHelper.MaxRowNumber + RangeAddress.FirstAddress.RowNumber - 1)
+                );
             }
 
             return new XLTableRow(this, base.Row(row));
@@ -150,8 +152,9 @@
         {
             var retVal = new XLTableRows(Worksheet.Style);
 
-            for (int ro = firstRow; ro <= lastRow; ro++)
-                retVal.Add(Row(ro));
+            for (int rowNumber = firstRow; rowNumber <= lastRow; rowNumber++)
+                retVal.Add(Row(rowNumber));
+
             return retVal;
         }