diff --git a/src/main/java/de/tims/fleetstorm/matchfield/Matchfield.java b/src/main/java/de/tims/fleetstorm/matchfield/Matchfield.java
index e803cee..9c86328 100644
--- a/src/main/java/de/tims/fleetstorm/matchfield/Matchfield.java
+++ b/src/main/java/de/tims/fleetstorm/matchfield/Matchfield.java
@@ -48,7 +48,9 @@ public class Matchfield {
 	}
 
 	public Coordinate getBelow(Coordinate center) {
-		// TODO Auto-generated method stub
+		if (center.getX() == 0) {
+			return null;
+		}
 		return this.matchfield[center.getX() - 1][center.getY()];
 	}
 
diff --git a/src/test/java/de/tims/fleetstorm/matchfield/MatchfieldCreationTest.java b/src/test/java/de/tims/fleetstorm/matchfield/MatchfieldCreationTest.java
index edb160c..1936f86 100644
--- a/src/test/java/de/tims/fleetstorm/matchfield/MatchfieldCreationTest.java
+++ b/src/test/java/de/tims/fleetstorm/matchfield/MatchfieldCreationTest.java
@@ -90,7 +90,9 @@ class MatchfieldCreationTest {
 
 	static Stream<Arguments> getCoordinateBelow() {
 		Matchfield matchfield = new Matchfield(10);
-		return Stream.of(Arguments.of("bewlow from (5/5) - should be (4,5)", matchfield, new Coordinate(5, 5),
-				matchfield.getField(4, 5)));
+		return Stream.of(
+				Arguments.of("bewlow from (5/5) - should be (4,5)", matchfield, new Coordinate(5, 5),
+						matchfield.getField(4, 5)),
+				Arguments.of("bewlow from (0/5) - should be null", matchfield, new Coordinate(0, 5), null));
 	}
 }