diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index aeb53037d1b667a8d2a2574c7a9dab496df28dcd..f1462a4484c63bb278cd97f459511bc35f111db6 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -447,7 +447,11 @@ public class ThumbnailManager {
         }
 
         private boolean deleteEmptyDirectory(final Path dir) throws IOException {
-            if (dir.toFile().list().length == 0 && !dir.toFile().getName().equals(THUMBNAILS_DIR_NAME)) {
+            if (dir == null) {
+                return false;
+            }
+            final File directory = dir.toFile();
+            if (directory.list() != null && directory.list().length == 0 && !THUMBNAILS_DIR_NAME.equals(directory.getName())) {
                 Files.delete(dir);
                 if (logger.isDebugEnabled()) {
                     logger.debug("Delete " + dir);