server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs

@@ -74,10 +74,20 @@ namespace AyaNova.Biz
             Validate(dbObject);
             if (HasErrors)
                 return null;
-            await ct.SaveChangesAsync();
+
+            try
+            {
+                await ct.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                AddError(ApiErrorCode.CONCURRENCY_CONFLICT);
+                return null;
+            }
+
             await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, 1, BizType, AyaEvent.Modified), ct);
             //Update the static copy for the server
-            ServerGlobalOpsSettingsCache.Backup=dbObject;
+            ServerGlobalOpsSettingsCache.Backup = dbObject;
             return dbObject;
         }