diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
index d3809f299..ded22a58c 100644
--- a/src/ProjectFileManager.cpp
+++ b/src/ProjectFileManager.cpp
@@ -352,14 +352,15 @@ bool ProjectFileManager::DoSave (const bool fromSaveAs,
       safetyFileName = fileName + wxT(".bak");
 #endif
 
+      bool bOK=true;
       if (wxFileExists(safetyFileName))
-         wxRemoveFile(safetyFileName);
+         bOK = wxRemoveFile(safetyFileName);
 
       if ( !wxRenameFile(fileName, safetyFileName) ) {
          AudacityMessageBox(
             wxString::Format(
-               _("Could not create safety file: %s"), safetyFileName ),
-            _("Error"), wxICON_STOP, &window);
+               _("Audacity failed to write file %s.\nPerhaps disk is full or not writable."), safetyFileName ),
+            _("Error Writing to File"), wxICON_STOP, &window);
          return false;
       }
    }