diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b6639e8a2a8728809d9b17c8d155baf9b6..05051452e71a5c6c251836b9e33465da233571c7 100644
--- a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+++ b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
@@ -112,7 +112,11 @@ public class DotsAndBoxesGrid {
 
         // 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;
+        if (horizontals[x][y] && horizontals[x][y+1] && verticals[x][y] && verticals[x+1][y]) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -141,6 +145,10 @@ public class DotsAndBoxesGrid {
 
         // FIXME: You need to throw an exception if the line was already drawn.
 
+        if (horizontals[x][y]) {
+            throw new IllegalArgumentException("Horizontal line already drawn");
+        }
+
         this.horizontals[x][y] = true;
 
         // Try to claim the north or south boxes
@@ -172,6 +180,10 @@ public class DotsAndBoxesGrid {
 
         // You need to throw an exception if the line was already drawn.
 
+        if (verticals[x][y]) {
+            throw new IllegalArgumentException("Vertical line already drawn");
+        }
+
         this.verticals[x][y] = true;
         // Try to claim the north or south boxes
         boolean claimE = claimBox(x, y, player);