diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index 06b124db7..91b26f025 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1922,6 +1922,7 @@ int AudacityApp::OnExit()
 
    mRecentFiles->Save(*gPrefs, wxT("RecentFiles"));
    delete mRecentFiles;
+   mRecentFiles = NULL;
 
    FinishPreferences();
 
diff --git a/src/Project.cpp b/src/Project.cpp
index f21e2b7ee..f4b7f089b 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -795,7 +795,8 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
      mMenuClose(false),
      mShownOnce(false),
      mbInitializingScrollbar(false),
-     mViewInfo(0.0, 1.0, ZoomInfo::GetDefaultZoom())
+     mViewInfo(0.0, 1.0, ZoomInfo::GetDefaultZoom()),
+     mIsBeingDeleted(false)
 {
    // Note that the first field of the status bar is a dummy, and it's width is set
    // to zero latter in the code. This field is needed for wxWidgets 2.8.12 because
@@ -1038,7 +1039,10 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
 
 AudacityProject::~AudacityProject()
 {
-   wxGetApp().GetRecentFiles()->RemoveMenu(mRecentFilesMenu);
+   if (wxGetApp().GetRecentFiles())
+   {
+      wxGetApp().GetRecentFiles()->RemoveMenu(mRecentFilesMenu);
+   }
 
    wxTheApp->Disconnect(EVT_AUDIOIO_CAPTURE,
                      wxCommandEventHandler(AudacityProject::OnCapture),