diff --git a/src/main/java/dotsandboxes/DotsAndBoxesGrid.java b/src/main/java/dotsandboxes/DotsAndBoxesGrid.java
index a9e7c5b6639e8a2a8728809d9b17c8d155baf9b6..60d211951e288da6c56864e1106ddd68259d9097 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+1][y] && verticals[x][y] && verticals[x][y+1]){
+            return true;
+          }
+
+        return false;
     }
 
     /** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
@@ -140,6 +144,9 @@ public class DotsAndBoxesGrid {
         }
 
         // FIXME: You need to throw an exception if the line was already drawn.
+        if(horizontals[x][y] == true){
+          throw new IllegalStateException("Horizontal line already drawn");
+        }
 
         this.horizontals[x][y] = true;
 
@@ -171,6 +178,9 @@ public class DotsAndBoxesGrid {
         }
 
         // You need to throw an exception if the line was already drawn.
+        if(verticals[x][y] == true){
+          throw new IllegalStateException("Vertical line already drawn");
+        }
 
         this.verticals[x][y] = true;
         // Try to claim the north or south boxes