diff --git a/MacPass/MPToolbarItem.m b/MacPass/MPToolbarItem.m
index c9406fc6..67c81ff9 100644
--- a/MacPass/MPToolbarItem.m
+++ b/MacPass/MPToolbarItem.m
@@ -14,9 +14,12 @@
 - (void)validate {
   if(![self.view menu]) {
     id target = [NSApp targetForAction:[self action] to:nil from:self];
-    BOOL isValid = [[[[NSApplication sharedApplication] keyWindow] windowController] validateToolbarItem:self];
-    [self setEnabled:( isValid && (nil != target) )];
-    
+    id windowController = [[self.view window] windowController];
+    BOOL isValid = (nil != target);
+    if( [windowController respondsToSelector:@selector(validateToolbarItem:)]) {
+      isValid &= [windowController validateToolbarItem:self];
+    }
+    [self setEnabled:isValid];
   }
 }
 @end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 6526b8fb..44b04585 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>AB7</string>
+	<string>AB9</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>