diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b6639e8a2a8728809d9b17c8d155baf9b6..2dc0b7092827bf4c10dcf0dcc91e62ccd6c247e9 100644
--- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
@@ -110,9 +110,8 @@ public class DotsAndBoxesGrid {
             return false;
         }
 
-        // A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
-        // FIXME: You'll need to fix this code (after writing a test first).
-        return true;
+        // return true only if the north and south horizontals and the east and west verticals have all been drawn.
+        return verticals[x][y] && verticals[x + 1][y] && horizontals[x][y] && horizontals[x][y + 1];
     }
 
     /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -139,7 +138,10 @@ public class DotsAndBoxesGrid {
             throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height));
         }
 
-        // FIXME: You need to throw an exception if the line was already drawn.
+        // throw an exception if the line was already drawn.
+        if (horizontals[x][y]) {
+            throw new IllegalStateException("Horizontal line already drawn.");
+        }
 
         this.horizontals[x][y] = true;
 
@@ -170,7 +172,10 @@ public class DotsAndBoxesGrid {
             throw new IndexOutOfBoundsException(String.format("y was %d, which is out of range. Range is 0 to %d", y, height - 1));
         }
 
-        // You need to throw an exception if the line was already drawn.
+        // throw an exception if the line was already drawn.
+        if (verticals[x][y]) {
+            throw new IllegalStateException("Vertical line already drawn.");
+        }
 
         this.verticals[x][y] = true;
         // Try to claim the north or south boxes