diff --git a/pom.xml b/pom.xml
index f76a7fb8d..5b5b96a04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
 		<utflute.version>0.6.0F</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>1.0.5</crawler.version>
+		<crawler.version>1.0.6-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
 		<suggest.version>2.1.1</suggest.version>
diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
index 1857f2742..be1d50c24 100644
--- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
+++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
@@ -59,7 +59,6 @@ public class FessCrawlerThread extends CrawlerThread {
         final DynamicProperties systemProperties = ComponentUtil.getSystemProperties();
         if (systemProperties.getProperty(Constants.INCREMENTAL_CRAWLING_PROPERTY, Constants.TRUE).equals(Constants.TRUE)) {
 
-            log(logHelper, LogType.CHECK_LAST_MODIFIED, crawlerContext, urlQueue);
             final long startTime = System.currentTimeMillis();
 
             final FessConfig fessConfig = ComponentUtil.getFessConfig();
@@ -79,30 +78,39 @@ public class FessCrawlerThread extends CrawlerThread {
                 for (final String roleType : crawlingConfig.getRoleTypeValues()) {
                     roleTypeList.add(roleType);
                 }
-                if (fessConfig.isSmbRoleFromFile() && url.startsWith("smb://")) {
-                    // head method
-                    responseData = client.execute(RequestDataBuilder.newRequestData().head().url(url).build());
-                    if (responseData == null) {
+                if (url.startsWith("smb://")) {
+                    if (url.endsWith("/")) {
+                        // directory
                         return true;
                     }
-
-                    final ACE[] aces = (ACE[]) responseData.getMetaDataMap().get(SmbClient.SMB_ACCESS_CONTROL_ENTRIES);
-                    if (aces != null) {
-                        for (final ACE item : aces) {
-                            final SID sid = item.getSID();
-                            final String accountId = sambaHelper.getAccountId(sid);
-                            if (accountId != null) {
-                                roleTypeList.add(accountId);
-                            }
+                    if (fessConfig.isSmbRoleFromFile()) {
+                        // head method
+                        responseData = client.execute(RequestDataBuilder.newRequestData().head().url(url).build());
+                        if (responseData == null) {
+                            return true;
                         }
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("smbUrl:" + responseData.getUrl() + " roleType:" + roleTypeList.toString());
+
+                        final ACE[] aces = (ACE[]) responseData.getMetaDataMap().get(SmbClient.SMB_ACCESS_CONTROL_ENTRIES);
+                        if (aces != null) {
+                            for (final ACE item : aces) {
+                                final SID sid = item.getSID();
+                                final String accountId = sambaHelper.getAccountId(sid);
+                                if (accountId != null) {
+                                    roleTypeList.add(accountId);
+                                }
+                            }
+                            if (logger.isDebugEnabled()) {
+                                logger.debug("smbUrl:" + responseData.getUrl() + " roleType:" + roleTypeList.toString());
+                            }
                         }
                     }
                 }
                 dataMap.put(fessConfig.getIndexFieldRole(), roleTypeList);
                 final String id = crawlingInfoHelper.generateId(dataMap);
 
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Searching indexed document: " + id);
+                }
                 final Map<String, Object> document =
                         indexingHelper.getDocument(
                                 fessEsClient,
@@ -129,6 +137,8 @@ public class FessCrawlerThread extends CrawlerThread {
                 if (lastModified == null) {
                     return true;
                 }
+                urlQueue.setLastModified(lastModified.getTime());
+                log(logHelper, LogType.CHECK_LAST_MODIFIED, crawlerContext, urlQueue);
 
                 if (responseData == null) {
                     // head method
@@ -139,6 +149,9 @@ public class FessCrawlerThread extends CrawlerThread {
                 }
 
                 final int httpStatusCode = responseData.getHttpStatusCode();
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Accessing document: " + url + ", status: " + httpStatusCode);
+                }
                 if (httpStatusCode == 404) {
                     storeChildUrlsToQueue(urlQueue, getAnchorSet(document.get(fessConfig.getIndexFieldAnchor())));
                     indexingHelper.deleteDocument(fessEsClient, id);