diff --git a/src/TicTacToe.java b/src/TicTacToe.java
index 8658cafd86fd2d3dff6e1339e601b1753de8a0b3..18d1172ac866a13295ae239aa09ce0dcc90f2fa0 100644
--- a/src/TicTacToe.java
+++ b/src/TicTacToe.java
@@ -18,7 +18,7 @@ public class TicTacToe {
     public static void main(String[] args) {
         TicTacToe game = new TicTacToe();
         game.startGame();
-        System.out.println("Debug help Nullpointer exception");
+
 
 
         while (!board.checkForWin()){
diff --git a/src/logic/Board.java b/src/logic/Board.java
index 673296ec75d936ba63f018ffed853b2796aca815..d53c95c6e5c14e791ad41dc63527659d5f290290 100644
--- a/src/logic/Board.java
+++ b/src/logic/Board.java
@@ -49,18 +49,18 @@ public class Board{
     public boolean checkForWin(){
         //checks rows and columns
         for(int i = 0; i < 3; i++) {
-            if(gameboard[i][0] == gameboard[i][1] && gameboard[i][0] == gameboard[i][2]) {
+            if(gameboard[i][0] == gameboard[i][1] && gameboard[i][0] == gameboard[i][2] && gameboard[i][0] != '#') {
                 this.setWinner(gameboard[i][0]);
                 return true;
             }
-            if(gameboard[0][i] == gameboard[1][i] && gameboard[0][i] == gameboard[2][i]) {
+            if(gameboard[0][i] == gameboard[1][i] && gameboard[0][i] == gameboard[2][i] && gameboard[i][0] != '#') {
                 this.setWinner(gameboard[i][0]);
                 return true;
             }
 
             }
         //checks diagonals
-        if((gameboard[0][0] == gameboard[1][1] && gameboard[0][0] == gameboard[2][2]) || (gameboard[0][2] == gameboard[1][1] && gameboard[0][2] == gameboard[2][0])) {
+        if((gameboard[0][0] == gameboard[1][1] && gameboard[0][0] == gameboard[2][2]) || (gameboard[0][2] == gameboard[1][1] && gameboard[0][2] == gameboard[2][0] && gameboard[1][1] != '#')) {
             this.setWinner(gameboard[1][1]);
             return true;
         }