diff --git a/app/src/main/java/chess/model/Game.java b/app/src/main/java/chess/model/Game.java
index 2ec63f7..fd19c1b 100644
--- a/app/src/main/java/chess/model/Game.java
+++ b/app/src/main/java/chess/model/Game.java
@@ -1,6 +1,5 @@
 package chess.model;
 
-import java.util.EmptyStackException;
 import java.util.Stack;
 
 import chess.controller.PlayerCommand;
@@ -92,12 +91,9 @@ public class Game {
 	}
 
 	public PlayerCommand getLastAction() {
-		try {
-			PlayerCommand last = this.movesHistory.pop();
-			return last;
-		} catch (EmptyStackException e) {
+		if (this.movesHistory.isEmpty())
 			return null;
-		}
+		return this.movesHistory.pop();
 	}
 
 	public void updateLastMove() {