diff --git a/SparkleShare/Makefile.am b/SparkleShare/Makefile.am
index d1c946a6..96350ab7 100644
--- a/SparkleShare/Makefile.am
+++ b/SparkleShare/Makefile.am
@@ -12,6 +12,7 @@ BUILD_DEFINES="-define:HAVE_APP_INDICATOR"
 endif
 
 SOURCES =  \
+	Program.cs \
 	SparkleAbout.cs \
 	SparkleAboutController.cs \
 	SparkleBubbles.cs \
@@ -25,7 +26,6 @@ SOURCES =  \
 	SparkleSetup.cs \
 	SparkleSetupController.cs \
 	SparkleSetupWindow.cs \
-	Program.cs \
 	SparkleSpinner.cs \
 	SparkleStatusIcon.cs \
 	SparkleStatusIconController.cs \
diff --git a/SparkleShare/SparkleBubbles.cs b/SparkleShare/SparkleBubbles.cs
index 154f209e..8b29622b 100644
--- a/SparkleShare/SparkleBubbles.cs
+++ b/SparkleShare/SparkleBubbles.cs
@@ -30,17 +30,23 @@ namespace SparkleShare {
         public SparkleBubbles ()
         {
             Controller.ShowBubbleEvent += delegate (string title, string subtext, string image_path) {
-                Notification notification = new Notification () {
-                    Timeout  = 5 * 1000,
-                    Urgency  = Urgency.Low
-                };
+                try {
+                    Notification notification = new Notification () {
+                        Timeout  = 5 * 1000,
+                        Urgency  = Urgency.Low
+                    };
+    
+                    if (image_path != null)
+                        notification.Icon = new Gdk.Pixbuf (image_path);
+                    else
+                        notification.IconName = "folder-sparkleshare";
 
-                if (image_path != null)
-                    notification.Icon = new Gdk.Pixbuf (image_path);
-                else
-                    notification.IconName = "folder-sparkleshare";
+                    notification.Show ();
 
-                notification.Show ();
+                } catch (Exception) {
+                    // Ignore exceptions thrown by libnotify,
+                    // they're not important enough to crash
+                }
             };
         }
     }