diff --git a/src/core.py b/src/core.py
index 4f9e5c196..c7c4e8a23 100644
--- a/src/core.py
+++ b/src/core.py
@@ -696,6 +696,11 @@ class Manager:
 		
 		if no_space:
 			self.apply_queue()
+		# Pickle the state so if we experience a crash, the latest state is available
+		print "Pickling state..."
+		output = open(os.path.join(self.base_dir, STATE_FILENAME), 'wb')
+		pickle.dump(self.state, output)
+		output.close()
 
 		return ret