diff --git a/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java b/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java
index a907f4d..9eb1ccc 100644
--- a/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java
+++ b/src/main/java/org/commonjava/indy/service/archive/controller/ArchiveController.java
@@ -187,7 +187,7 @@ public void generate( HistoricalContentDTO content )
                 finally
                 {
                     buildConfigLocks.remove( buildConfigId );
-                    logger.info( "lock released, buildConfigId {}", buildConfigId );
+                    logger.info( "<<<Lock released for buildConfigId {}", buildConfigId );
                 }
             } );
             try
@@ -216,7 +216,7 @@ public void generate( HistoricalContentDTO content )
     protected Boolean doGenerate( HistoricalContentDTO content )
     {
         String buildConfigId = content.getBuildConfigId();
-        logger.info( "Handle generate event: {}, build config id: {}", EVENT_GENERATE_ARCHIVE, buildConfigId );
+        logger.info( "<<<Handle generate event: {}, build config id: {}", EVENT_GENERATE_ARCHIVE, buildConfigId );
 
         Map<String, HistoricalEntryDTO> entryDTOs = reader.readEntries( content );
         Map<String, String> downloadPaths = new HashMap<>();
@@ -483,10 +483,15 @@ private boolean renderArchive( File part, final String buildConfigId )
     public List<File> walkAllFiles( String path )
             throws IOException
     {
-        List<File> contents = Files.walk( Paths.get( path ) )
-                                   .filter( Files::isRegularFile )
-                                   .map( Path::toFile )
-                                   .collect( Collectors.toList() );
+        List<File> contents = new ArrayList<>();
+        Path directoryPath = Paths.get( path );
+        if ( Files.exists( directoryPath ) )
+        {
+            contents = Files.walk( directoryPath )
+                            .filter( Files::isRegularFile )
+                            .map( Path::toFile )
+                            .collect( Collectors.toList() );
+        }
         return contents;
     }
 
diff --git a/src/main/java/org/commonjava/indy/service/archive/schedule/ArchiveFileCleanup.java b/src/main/java/org/commonjava/indy/service/archive/schedule/ArchiveFileCleanup.java
index 45b67a7..919ab25 100644
--- a/src/main/java/org/commonjava/indy/service/archive/schedule/ArchiveFileCleanup.java
+++ b/src/main/java/org/commonjava/indy/service/archive/schedule/ArchiveFileCleanup.java
@@ -47,7 +47,7 @@ public class ArchiveFileCleanup
     void cleanup()
             throws IOException
     {
-        logger.info( "Start not used archive files cleanup." );
+        logger.info( "<<<Start not used archive files cleanup." );
         String storeDir = preSeedConfig.storageDir().orElse( "data" );
         String archiveDir = String.format( "%s%s", storeDir, ARCHIVE_DIR );
 
@@ -66,7 +66,7 @@ void cleanup()
             {
                 artifact.delete();
                 logger.info(
-                        "Not used archive files cleanup is finished for archive file: {}, not used days: {}, config: {}.",
+                        "<<<Not used archive files cleanup is finished for archive file: {}, not used days: {}, config: {}.",
                         artifact.getPath(), days, notUsedDays );
             }
         }