diff --git a/src/view/Square.java b/src/view/Square.java
index 785ca8f..6ef7e93 100644
--- a/src/view/Square.java
+++ b/src/view/Square.java
@@ -84,8 +84,9 @@ public void setPiece(Checker piece) {
 	}
 	
 	public void removePiece() {
-
-		this.remove(this.piece);
+		if (null != this.piece) {
+			this.remove(this.piece);
+		}
 	}