diff --git a/src/main/kotlin/mdnet/Main.kt b/src/main/kotlin/mdnet/Main.kt
index 775d7e5..7c0125f 100644
--- a/src/main/kotlin/mdnet/Main.kt
+++ b/src/main/kotlin/mdnet/Main.kt
@@ -86,11 +86,11 @@ class Main : Runnable {
             throw IllegalArgumentException()
         }
 
-        if (!Files.isDirectory(databaseFolder)) {
+        if (Files.isRegularFile(databaseFolder)) {
             throw IllegalArgumentException("Database folder $databaseFolder must be a directory")
         }
 
-        if (!Files.isDirectory(cacheFolder)) {
+        if (Files.isRegularFile(cacheFolder)) {
             throw IllegalArgumentException("Cache folder $cacheFolder must be a directory")
         }
 
diff --git a/src/main/kotlin/mdnet/server/ImageServer.kt b/src/main/kotlin/mdnet/server/ImageServer.kt
index 76914f0..966e700 100644
--- a/src/main/kotlin/mdnet/server/ImageServer.kt
+++ b/src/main/kotlin/mdnet/server/ImageServer.kt
@@ -51,6 +51,10 @@ fun getServer(
     client: HttpHandler
 ): Http4kServer {
     val circuitBreakerRegistry = CircuitBreakerRegistry.ofDefaults()
+    TaggedCircuitBreakerMetrics
+        .ofCircuitBreakerRegistry(circuitBreakerRegistry)
+        .bindTo(registry)
+
     val circuitBreaker = circuitBreakerRegistry.circuitBreaker(
         "upstream",
         CircuitBreakerConfig.custom()
@@ -77,10 +81,6 @@ fun getServer(
         LOGGER.warn { "Circuit breaker has moved from ${it.stateTransition.fromState} to ${it.stateTransition.toState}" }
     }
 
-    TaggedCircuitBreakerMetrics
-        .ofCircuitBreakerRegistry(circuitBreakerRegistry)
-        .bindTo(registry)
-
     val circuited = ResilienceFilters.CircuitBreak(
         circuitBreaker,
         isError = { r: Response -> !r.status.successful }