diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
index 985dacc..b33939a 100644
--- a/PHP Monitor.xcodeproj/project.pbxproj	
+++ b/PHP Monitor.xcodeproj/project.pbxproj	
@@ -2889,7 +2889,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1077;
+				CURRENT_PROJECT_VERSION = 1079;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2902,7 +2902,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 5.8;
+				MARKETING_VERSION = 5.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2919,7 +2919,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1077;
+				CURRENT_PROJECT_VERSION = 1079;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
@@ -2932,7 +2932,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 5.8;
+				MARKETING_VERSION = 5.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3148,7 +3148,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1077;
+				CURRENT_PROJECT_VERSION = 1079;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3160,7 +3160,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 5.8;
+				MARKETING_VERSION = 5.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME) DEV";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3259,7 +3259,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 1077;
+				CURRENT_PROJECT_VERSION = 1079;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -3271,7 +3271,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.4;
-				MARKETING_VERSION = 5.8;
+				MARKETING_VERSION = 5.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/phpmon/Domain/Integrations/Valet/Scanners/ValetDomainScanner.swift b/phpmon/Domain/Integrations/Valet/Scanners/ValetDomainScanner.swift
index c8dcbf5..b8f55ac 100644
--- a/phpmon/Domain/Integrations/Valet/Scanners/ValetDomainScanner.swift
+++ b/phpmon/Domain/Integrations/Valet/Scanners/ValetDomainScanner.swift
@@ -14,14 +14,18 @@ class ValetDomainScanner: DomainScanner {
 
     func resolveSiteCount(paths: [String]) -> Int {
         return paths.map { path in
+            do {
+                let entries = try FileSystem
+                    .getShallowContentsOfDirectory(path)
 
-            let entries = try! FileSystem
-                .getShallowContentsOfDirectory(path)
-
-            return entries
-                .map { self.isSite($0, forPath: path) }
-                .filter { $0 == true}
-                .count
+                return entries
+                    .map { self.isSite($0, forPath: path) }
+                    .filter { $0 == true}
+                    .count
+            } catch {
+                Log.err("Unexpected error getting contents of \(path): \(error).")
+                return 0
+            }
 
         }.reduce(0, +)
     }
@@ -30,13 +34,17 @@ class ValetDomainScanner: DomainScanner {
         var sites: [ValetSite] = []
 
         paths.forEach { path in
-            let entries = try! FileSystem
-                .getShallowContentsOfDirectory(path)
+            do {
+                let entries = try FileSystem
+                    .getShallowContentsOfDirectory(path)
 
-            return entries.forEach {
-                if let site = self.resolveSite(path: "\(path)/\($0)") {
-                    sites.append(site)
+                return entries.forEach {
+                    if let site = self.resolveSite(path: "\(path)/\($0)") {
+                        sites.append(site)
+                    }
                 }
+            } catch {
+                Log.err("Unexpected error getting contents of \(path): \(error).")
             }
         }