diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
index b60d2b81..4cdbb3af 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
@@ -673,12 +673,12 @@ public void pieceSelect(PieceControl pieceSelected) {
             }
             if (!isSelected) {
                 pieceSelected.select();
-                selectedPieceNodeMap.get(pieceSelected).select();
+                if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).select();
                 selectedOwnPiece = pieceSelected;
             }
             else {
                 pieceSelected.unSelect();
-                selectedPieceNodeMap.get(pieceSelected).highlight();
+                if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).highlight();
                 selectedOwnPiece = null;
             }
         }