diff --git a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
index 435847d..67664db 100644
--- a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
+++ b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
@@ -293,13 +293,13 @@ public class Spreadsheet {
 
 		double avg = 0;
 		int counter = 0;
-		for(int r = getRow(startCellName); r<getRow(endCellName); r++)
-			for(int c = getCol(startCellName); c<getCol(endCellName); c++)
-				if(!(cells[r][c].isEmpty())) {
+		for(int r = getRow(startCellName); r<getRow(endCellName)+1; r++)
+			for(int c = getCol(startCellName); c<getCol(endCellName)+1; c++)
+				try {
 					avg += Double.parseDouble(cells[r][c].getValue());
 					counter++;
 					cellNames.add(getCellName(r, c));
-				}
+				} catch (NumberFormatException | ArrayIndexOutOfBoundsException a ){}
 		avg /= counter;
 		//average/ add cell names to list
 		System.out.println(cellNames);