src/dialog.c  |    2 +-
 src/session.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dialog.c b/src/dialog.c
index a272471..6e5b21a 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -250,7 +250,7 @@ SaveHistory(WMArray *history, char *filename)
         WMAddToPLArray(plhistory,
             WMCreatePLString(WMGetFromArray(history, i)));
 
-    WMWritePropListToFile(plhistory, (char*)filename, False);
+    WMWritePropListToFile(plhistory, (char*)filename, True);
     WMReleasePropList(plhistory);
 }
 
diff --git a/src/session.c b/src/session.c
index 12ef394..6d739cd 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1072,7 +1072,11 @@ smSaveYourselfPhase2Proc(SmcConn smc_conn, SmPointer client_data)
                                    WMCreatePLString("Screens"),
                                    state, NULL);
 
-    WMWritePropListToFile(plState, statefile, False);
+    if (!WMWritePropListToFile(plState, statefile, True)) {
+        wwarning(_("error while saving session state"));
+        WMReleasePropList(plState);
+        goto fail;
+    }
 
     WMReleasePropList(plState);