diff --git a/SparkleShare/Mac/SparkleUI.cs b/SparkleShare/Mac/SparkleUI.cs
index 54b4d194..ab7dd363 100755
--- a/SparkleShare/Mac/SparkleUI.cs
+++ b/SparkleShare/Mac/SparkleUI.cs
@@ -95,8 +95,8 @@ namespace SparkleShare {
 
         public void UpdateDockIconVisibility ()
         {
-            // if (true) { // TODO: check for open windows
-
+            // TODO: check for open windows
+            // if (true) {
                 ShowDockIcon ();
 
             // } else {
@@ -105,13 +105,15 @@ namespace SparkleShare {
         }
 
 
-        private void HideDockIcon () {
+        private void HideDockIcon ()
+        {
             // Currently not supported, here for completeness sake (see Apple's docs)
             // NSApplication.SharedApplication.ActivationPolicy = NSApplicationActivationPolicy.None;
         }
 
 
-        private void ShowDockIcon () {
+        private void ShowDockIcon ()
+        {
             NSApplication.SharedApplication.ActivationPolicy = NSApplicationActivationPolicy.Regular;
         }
 
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 5368cef8..ac5cac40 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -145,15 +145,21 @@ namespace SparkleShare {
                     this.fetcher.IsActive) {
 
                     if (AlertNotificationRaised != null)
-                        AlertNotificationRaised ("SparkleShare Setup is busy",
-                            "Please try again later");
+                        AlertNotificationRaised ("SparkleShare Setup seems busy",
+                            "Please wait for it to finish");
 
                 } else {
                     if (InviteReceived != null) {
                         SparkleInvite invite = new SparkleInvite (args.FullPath);
 
-                        if (invite.Valid)
+                        if (invite.Valid) {
                             InviteReceived (invite);
+
+                        } else {
+                            if (AlertNotificationRaised != null)
+                                AlertNotificationRaised ("Oh noes!",
+                                    "This invite seems screwed up...");
+                        }
                     }
                 }
             };