diff --git a/Greenshot/Destinations/FileWithDialogDestination.cs b/Greenshot/Destinations/FileWithDialogDestination.cs
index 1d895a307..cc837caf0 100644
--- a/Greenshot/Destinations/FileWithDialogDestination.cs
+++ b/Greenshot/Destinations/FileWithDialogDestination.cs
@@ -82,8 +82,6 @@ namespace Greenshot.Destinations {
 					surface.LastSaveFullPath = savedTo;
 					captureDetails.Filename = savedTo;
 					surface.SendMessageEvent(this, SurfaceMessageTyp.FileSaved, lang.GetFormattedString(LangKey.editor_imagesaved,surface.LastSaveFullPath));
-				} else {
-					surface.SendMessageEvent(this, SurfaceMessageTyp.Info, "");
 				}
 			}
 			return savedTo != null;
diff --git a/Greenshot/Helpers/CaptureHelper.cs b/Greenshot/Helpers/CaptureHelper.cs
index 1d09b2b65..014ec9b25 100644
--- a/Greenshot/Helpers/CaptureHelper.cs
+++ b/Greenshot/Helpers/CaptureHelper.cs
@@ -417,7 +417,10 @@ namespace Greenshot.Helpers {
 
 			// Register notify events if this is wanted			
 			if (conf.ShowTrayNotification) {
-				surface.SurfaceMessage += delegate(object source, SurfaceMessageEventArgs eventArgs) { 
+				surface.SurfaceMessage += delegate(object source, SurfaceMessageEventArgs eventArgs) {
+					if (string.IsNullOrEmpty(eventArgs.Message)) {
+						return;
+					}
 					switch (eventArgs.MessageType) {
 						case SurfaceMessageTyp.Error:
 							MainForm.instance.notifyIcon.ShowBalloonTip(10000, "Greenshot", eventArgs.Message, ToolTipIcon.Error);