diff --git a/macosx/Controller.m b/macosx/Controller.m
index aba751d4e..a5a93a168 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -847,8 +847,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     {
         NSAlert * alert = [[NSAlert alloc] init];
         [alert addButtonWithTitle: @"OK"];
-        [alert setMessageText: [NSString stringWithFormat: 
-                @"Copy of \"%@\" Cannot Be Created", [torrent name]]];
+        [alert setMessageText: [NSString stringWithFormat: @"Copy of \"%@\" Cannot Be Created", [torrent name]]];
         [alert setInformativeText: [NSString stringWithFormat: 
                 @"The torrent file (%@) cannot be found.", [torrent torrentLocation]]];
         [alert setAlertStyle: NSWarningAlertStyle];
diff --git a/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib b/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib
index 1d527544d..a0b5e65cb 100644
Binary files a/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib and b/macosx/English.lproj/MessageWindow.nib/keyedobjects.nib differ
diff --git a/macosx/MessageWindowController.m b/macosx/MessageWindowController.m
index ece7488fc..1aa05fdb8 100644
--- a/macosx/MessageWindowController.m
+++ b/macosx/MessageWindowController.m
@@ -170,7 +170,19 @@
 - (void) writeToFileSheetClosed: (NSSavePanel *) panel returnCode: (int) code contextInfo: (NSString *) string
 {
     if (code == NSOKButton)
-        [string writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil];
+    {
+        if (![string writeToFile: [panel filename] atomically: YES encoding: NSUTF8StringEncoding error: nil])
+        {
+            NSAlert * alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle: @"OK"];
+            [alert setMessageText: [NSString stringWithFormat: @"Log Could Not Be Saved"]];
+            [alert setInformativeText: [NSString stringWithFormat: 
+                    @"There was a problem creating the file \"%@\".", [[panel filename] lastPathComponent]]];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            [alert runModal];
+        }
+    }
     
     [string release];
 }