diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java
index db84e7f..1d4e8b5 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order2.java
@@ -11,7 +11,7 @@ public class Order2 extends OrderLogicCard {
     @Override
     public void effect(Player player,int index) throws IndexOutOfBoundsException
     {
-        if(index>=2)
+        if(index >= 2 || index < 0)
         {
             throw new IndexOutOfBoundsException("index out of bounds");
         }
diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java
index 34f3404..b978028 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order3.java
@@ -12,7 +12,7 @@ public class Order3 extends OrderLogicCard {
     @Override
     public void effect(Player player,int index) throws IndexOutOfBoundsException
     {
-        if(index>=3)
+        if(index >= 3 || index < 0)
         {
             throw new IndexOutOfBoundsException("index out of bounds");
         }
diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java
index 6630a7a..15ced7f 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order4.java
@@ -12,7 +12,7 @@ public class Order4 extends OrderLogicCard {
     @Override
     public void effect(Player player,int index) throws IndexOutOfBoundsException
     {
-        if(index>=4)
+        if(index>=4 || index < 0)
         {
             throw new IndexOutOfBoundsException("index out of bounds");
         }
diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java
index e6fb487..f375d5a 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java
+++ b/src/main/java/it/polimi/ingsw/gc14/Model/Orders/Order5.java
@@ -12,7 +12,7 @@ public class Order5 extends OrderLogicCard {
     @Override
     public void effect(Player player,int index) throws IndexOutOfBoundsException
     {
-        if(index>=5)
+        if(index>=5 || index < 0)
         {
             throw new IndexOutOfBoundsException("index out of bounds");
         }
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java
index 03cbc85..e769ae8 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java
@@ -35,5 +35,7 @@ class Order2Test {
 
         Order2 order3 = new Order2(new ArrayList<>());
         assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, 2));
+        Order2 order4 = new Order2(new ArrayList<>());
+        assertThrows(IndexOutOfBoundsException.class, () -> order4.effect(p1, -1));
     }
 }
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java
index 05ec787..2910434 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java
@@ -38,5 +38,6 @@ class Order3Test {
 
         Order3 order3 = new Order3(new ArrayList<>());
         assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, 3));
+        assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, -1));
     }
 }
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java
index 69db142..95895da 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java
@@ -47,5 +47,6 @@ class Order4Test {
 
         Order4 order3 = new Order4(new ArrayList<>());
         assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, 4));
+        assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, -1));
     }
 }
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java
index e936317..2936cd6 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java
@@ -54,5 +54,6 @@ class Order5Test {
 
         Order5 order3 = new Order5(new ArrayList<>());
         assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, 5));
+        assertThrows(IndexOutOfBoundsException.class, () -> order3.effect(p1, -1));
     }
 }
\ No newline at end of file