diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index 49edb1960..857366bdc 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -220,6 +220,15 @@ public class DataIndexHelper implements Serializable {
         @Override
         public void run() {
             running = true;
+            try {
+                process();
+            } finally {
+                running = false;
+                finished = true;
+            }
+        }
+
+        protected void process() {
             final DataStoreFactory dataStoreFactory = ComponentUtil.getDataStoreFactory();
             dataStore = dataStoreFactory.getDataStore(dataConfig.getHandlerName());
             if (dataStore == null) {
@@ -236,8 +245,6 @@ public class DataIndexHelper implements Serializable {
                     deleteOldDocs();
                 }
             }
-            running = false;
-            finished = true;
         }
 
         private void deleteOldDocs() {