diff --git a/WireGuard/WireGuard/Model/Configuration.swift b/WireGuard/WireGuard/Model/Configuration.swift
index 8ef93e6..4bed41b 100644
--- a/WireGuard/WireGuard/Model/Configuration.swift
+++ b/WireGuard/WireGuard/Model/Configuration.swift
@@ -28,7 +28,6 @@ struct InterfaceConfiguration: Codable {
     init(name: String, privateKey: Data) {
         self.name = name
         self.privateKey = privateKey
-        if (name.isEmpty) { fatalError("Empty name") }
         if (privateKey.count != 32) { fatalError("Invalid private key") }
     }
 }
diff --git a/WireGuard/WireGuard/UI/TunnelViewModel.swift b/WireGuard/WireGuard/UI/TunnelViewModel.swift
index bc826d5..e5c814f 100644
--- a/WireGuard/WireGuard/UI/TunnelViewModel.swift
+++ b/WireGuard/WireGuard/UI/TunnelViewModel.swift
@@ -98,7 +98,7 @@ class TunnelViewModel {
 
         func save() -> SaveResult<InterfaceConfiguration> {
             fieldsWithError.removeAll()
-            guard let name = scratchpad[.name] else {
+            guard let name = scratchpad[.name], (!name.isEmpty) else {
                 fieldsWithError.insert(.name)
                 return .error("Interface name is required")
             }
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 9552c42..48b2767 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -53,6 +53,7 @@ class TunnelsManager {
     }
 
     func add(tunnelConfiguration: TunnelConfiguration, completionHandler: @escaping (TunnelContainer, Error?) -> Void) {
+        assert(!tunnelConfiguration.interface.name.isEmpty)
         let tunnelProvider = TunnelProviderManager(tunnelConfiguration: tunnelConfiguration)
         for tunnel in tunnels {
             tunnel.index = tunnel.index + 1