diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 9fc6ddaf4..ec0c41c76 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1694,7 +1694,8 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths)
         int bad;
 
         err = SetFontPathElements(npaths, paths, &bad, FALSE);
-        client->errorValue = bad;
+        if (err != Success)
+            client->errorValue = bad;
     }
     return err;
 }