diff --git a/lib/core/shell.py b/lib/core/shell.py
index d1f1f1dca..5653819d2 100644
--- a/lib/core/shell.py
+++ b/lib/core/shell.py
@@ -49,7 +49,11 @@ def saveHistory(completion=None):
         pass
 
     readline.set_history_length(MAX_HISTORY_LENGTH)
-    readline.write_history_file(historyPath)
+    try:
+        readline.write_history_file(historyPath)
+    except IOError, msg:
+        warnMsg = "there was a problem writing the history file '%s' (%s)" % (historyPath, msg)
+        logger.warn(warnMsg)
 
 def loadHistory(completion=None):
     if not readlineAvailable():