diff --git a/Thor/AppModel.swift b/Thor/AppModel.swift
index 5bd849a..068df0a 100644
--- a/Thor/AppModel.swift
+++ b/Thor/AppModel.swift
@@ -20,15 +20,20 @@ class AppModel: Equatable {
     
     var icon: NSImage? {
         get {
-            let bundle = Bundle(url: appBundleURL)!
+            guard let bundle = Bundle(url: appBundleURL) else {
+                return nil
+            }
+            
             let compositeName = "\(bundle.bundleIdentifier):\(appIconName)"
-            if let file = bundle.pathForImageResource(appIconName), let bundleImage = NSImage(contentsOfFile: file) {
-                bundleImage.setName(compositeName)
-                bundleImage.size = NSSize(width: 36, height: 36)
-                return bundleImage
+            
+            guard let file = bundle.pathForImageResource(appIconName), let bundleImage = NSImage(contentsOfFile: file) else {
+                return nil
             }
             
-            return nil
+            bundleImage.setName(compositeName)
+            bundleImage.size = NSSize(width: 36, height: 36)
+            
+            return bundleImage
         }
     }