diff --git a/OOP_2B1_Project/src/backend/Board.java b/OOP_2B1_Project/src/backend/Board.java
index 049d99f..1e291b4 100644
--- a/OOP_2B1_Project/src/backend/Board.java
+++ b/OOP_2B1_Project/src/backend/Board.java
@@ -212,7 +212,7 @@ public class Board {
 			select = true;
 			possibleMoves = kingCheck.getLegalMoves(board.get(y).get(x), board);
 //			possibleMoves = board.get(y).get(x).getPossibleMoves(board);
-			possibleMoves = board.get(y).get(x).getPossibleMoves(board, lastMove);//same as kingCheck
+			// possibleMoves = board.get(y).get(x).getPossibleMoves(board, lastMove);//same as kingCheck
 
 		}
 		else if (select == true && this.xm != x || this.ym != y){
@@ -240,10 +240,12 @@ public class Board {
 
 	public boolean isCheck(int x, int y) {
 		boolean out = false;
+		if (board.get(x).get(y) != null) {
 		if (board.get(y).get(x).getType() == PieceType.King && board.get(y).get(x).isWhite == turnColor){
 			if (kingCheck.isKingInCheck(board,turnColor)) {
 				out = true;
-			}
+			    }
+            }
 		}
 		return out;
 	}