diff --git a/DroidFish/src/org/petero/droidfish/gamelogic/Game.java b/DroidFish/src/org/petero/droidfish/gamelogic/Game.java
index 22097ec..30276e9 100644
--- a/DroidFish/src/org/petero/droidfish/gamelogic/Game.java
+++ b/DroidFish/src/org/petero/droidfish/gamelogic/Game.java
@@ -148,8 +148,11 @@ public class Game {
         if (m != null)
             if (!TextIO.isValid(currPos(), m))
                 m = null;
-        if (m == null)
+        if (m == null) {
             m = TextIO.stringToMove(currPos(), str);
+            if (!TextIO.isValid(currPos(), m))
+                m = null;
+        }
         if (m == null)
             return new Pair<Boolean,Move>(false, null);
 
diff --git a/DroidFishTest/src/org/petero/droidfish/gamelogic/GameTest.java b/DroidFishTest/src/org/petero/droidfish/gamelogic/GameTest.java
index ef8d939..e52c5ad 100644
--- a/DroidFishTest/src/org/petero/droidfish/gamelogic/GameTest.java
+++ b/DroidFishTest/src/org/petero/droidfish/gamelogic/GameTest.java
@@ -468,7 +468,9 @@ public class GameTest extends TestCase {
         assertEquals(TextIO.UCIstringToMove("b8c6"), hist.second.get(1));
         assertEquals(expectedPos, hist.first);
 
-        game.processString("--");
+        int varNo = game.tree.addMove("--", "", 0, "", "");
+        assertEquals(0, varNo);
+        game.tree.goForward(varNo);
         hist = game.getUCIHistory();
         expectedPos = new Position(game.currPos());
         assertEquals(0, hist.second.size());