diff --git a/Passepartout-iOS-Tunnel/PacketTunnelProvider.swift b/Passepartout-iOS-Tunnel/PacketTunnelProvider.swift
index a4fb783c..0f2cab0f 100644
--- a/Passepartout-iOS-Tunnel/PacketTunnelProvider.swift
+++ b/Passepartout-iOS-Tunnel/PacketTunnelProvider.swift
@@ -27,9 +27,7 @@ import TunnelKit
 
 class PacketTunnelProvider: TunnelKitProvider {
     override func startTunnel(options: [String : NSObject]?, completionHandler: @escaping (Error?) -> Void) {
-        if let version = GroupConstants.App.version {
-            appVersion = "\(GroupConstants.App.name) \(version)"
-        }
+        appVersion = "\(GroupConstants.App.name) \(GroupConstants.App.versionString)"
         dnsTimeout = GroupConstants.VPN.dnsTimeout
         logSeparator = GroupConstants.VPN.sessionMarker
         super.startTunnel(options: options, completionHandler: completionHandler)
diff --git a/Passepartout/Sources/GroupConstants.swift b/Passepartout/Sources/GroupConstants.swift
index 21ef0234..6424e41f 100644
--- a/Passepartout/Sources/GroupConstants.swift
+++ b/Passepartout/Sources/GroupConstants.swift
@@ -34,14 +34,11 @@ class GroupConstants {
         static let title = name
 //        static let title = "\u{1F511}"
 
-        static var version: String? {
-            guard let info = Bundle.main.infoDictionary else {
-                return nil
-            }
-            let versionNumber = info["CFBundleShortVersionString"] as! String
-            let buildNumber = info[kCFBundleVersionKey as String] as! String
-            return "\(versionNumber) (\(buildNumber))"
-        }
+        static let versionNumber = Bundle.main.infoDictionary!["CFBundleShortVersionString"] as! String
+
+        static let buildNumber = Int(Bundle.main.infoDictionary![kCFBundleVersionKey as String] as! String)!
+
+        static let versionString = "\(versionNumber) (\(buildNumber))"
         
         static let teamId = "5357M5NW9W"
 
diff --git a/Passepartout/Sources/Model/DebugLog.swift b/Passepartout/Sources/Model/DebugLog.swift
index ecc38b82..a5f707a6 100644
--- a/Passepartout/Sources/Model/DebugLog.swift
+++ b/Passepartout/Sources/Model/DebugLog.swift
@@ -46,10 +46,8 @@ struct DebugLog {
     }
 
     func decoratedString() -> String {
-        guard let appVersion = GroupConstants.App.version else {
-            fatalError("Could not find bundle app version?")
-        }
         let appName = GroupConstants.App.name
+        let appVersion = GroupConstants.App.versionString
 
         var metadata: [String] = []
         let osVersion: String