diff --git a/flight/Modules/System/systemmod.c b/flight/Modules/System/systemmod.c
index bf3ae7b01..e332843a8 100644
--- a/flight/Modules/System/systemmod.c
+++ b/flight/Modules/System/systemmod.c
@@ -215,7 +215,7 @@ static void objectUpdatedCb(UAVObjEvent * ev)
 		// Get object data
 		ObjectPersistenceGet(&objper);
 
-		int retval = -1;
+		int retval = 1;
 		// Execute action
 		if (objper.Operation == OBJECTPERSISTENCE_OPERATION_LOAD) {
 			if (objper.Selection == OBJECTPERSISTENCE_SELECTION_SINGLEOBJECT) {
@@ -242,6 +242,10 @@ static void objectUpdatedCb(UAVObjEvent * ev)
 				}
 				// Save selected instance
 				retval = UAVObjSave(obj, objper.InstanceID);
+				
+				// Verify saving worked
+				if (retval == 0)
+					retval = UAVObjLoad(obj, objper.InstanceID);
 			} else if (objper.Selection == OBJECTPERSISTENCE_SELECTION_ALLSETTINGS
 				   || objper.Selection == OBJECTPERSISTENCE_SELECTION_ALLOBJECTS) {
 				retval = UAVObjSaveSettings();
@@ -271,9 +275,17 @@ static void objectUpdatedCb(UAVObjEvent * ev)
 			retval = PIOS_FLASHFS_Format();
 #endif
 		}
-		if(retval == 0) { 
-			objper.Operation = OBJECTPERSISTENCE_OPERATION_COMPLETED;
-			ObjectPersistenceSet(&objper);
+		switch(retval) {
+			case 0:
+				objper.Operation = OBJECTPERSISTENCE_OPERATION_COMPLETED;
+				ObjectPersistenceSet(&objper);
+				break;
+			case -1:
+				objper.Operation = OBJECTPERSISTENCE_OPERATION_ERROR;
+				ObjectPersistenceSet(&objper);
+				break;
+			default:
+				break;
 		}
 	}
 }
diff --git a/shared/uavobjectdefinition/objectpersistence.xml b/shared/uavobjectdefinition/objectpersistence.xml
index afeb2ff24..2d73e07b3 100644
--- a/shared/uavobjectdefinition/objectpersistence.xml
+++ b/shared/uavobjectdefinition/objectpersistence.xml
@@ -1,7 +1,7 @@
 <xml>
     <object name="ObjectPersistence" singleinstance="true" settings="false">
         <description>Someone who knows please enter this</description>
-        <field name="Operation" units="" type="enum" elements="1" options="NOP,Load,Save,Delete,FullErase,Completed"/>
+        <field name="Operation" units="" type="enum" elements="1" options="NOP,Load,Save,Delete,FullErase,Completed,Error"/>
         <field name="Selection" units="" type="enum" elements="1" options="SingleObject,AllSettings,AllMetaObjects,AllObjects"/>
         <field name="ObjectID" units="" type="uint32" elements="1"/>
         <field name="InstanceID" units="" type="uint32" elements="1"/>