diff --git a/src/com/hippo/ehviewer/ehclient/EhClient.java b/src/com/hippo/ehviewer/ehclient/EhClient.java
index c4b532ea8..0625dad37 100644
--- a/src/com/hippo/ehviewer/ehclient/EhClient.java
+++ b/src/com/hippo/ehviewer/ehclient/EhClient.java
@@ -589,7 +589,11 @@ public class EhClient {
                     break;
                 case ListParser.NOT_FOUND:
                     maxPage = 0;
+                    indexPerPage = parser.indexPerPage;
+                    lmdArray = new ArrayList<GalleryInfo>();
                     break;
+                case ListParser.PARSER_ERROR:
+                    eMsg = "parser error";
                 }
             } else
                 eMsg = hp.getEMsg();
diff --git a/src/com/hippo/ehviewer/ehclient/ListParser.java b/src/com/hippo/ehviewer/ehclient/ListParser.java
index 236a2af9b..7ea716e27 100644
--- a/src/com/hippo/ehviewer/ehclient/ListParser.java
+++ b/src/com/hippo/ehviewer/ehclient/ListParser.java
@@ -31,7 +31,7 @@ public class ListParser {
     public static final int SAD_PANDA = 0x3;
     public static final int PARSER_ERROR = -1;
     
-    public int indexPerPage;
+    public int indexPerPage = 25;
     public int maxPage;
     
     public ArrayList<GalleryInfo> giList;
@@ -49,8 +49,6 @@ public class ListParser {
             int maxIndex = Integer.parseInt(m.group(3).replace(",", ""));
             if (endIndex != maxIndex || startIndex == 1)
                 indexPerPage = endIndex - startIndex + 1;
-            else
-                indexPerPage = 25; // default
             maxPage = (maxIndex + indexPerPage - 1) / indexPerPage;
         } else if (pageContext.contains("No hits found</p></div>")) {
             maxPage = 0;