diff --git a/parts/2/renderingCollections/src/App.jsx b/parts/2/renderingCollections/src/App.jsx
index ea012f6..7aaa883 100644
--- a/parts/2/renderingCollections/src/App.jsx
+++ b/parts/2/renderingCollections/src/App.jsx
@@ -42,9 +42,15 @@ const App = ({ startingNotes = [] }) => {
     const note = notes.find((n) => n.id === id);
     const changedNote = { ...note, important: !note.important };
 
-    noteService.update(id, changedNote).then((response) => {
-      setNotes(notes.map((note) => (note.id === id ? response.data : note)));
-    });
+    noteService
+      .update(id, changedNote)
+      .then((response) => {
+        setNotes(notes.map((note) => (note.id === id ? response.data : note)));
+      })
+      .catch((error) => {
+        alert(`The note '${note.content}' was already deleted from server.`);
+        setNotes(notes.filter((n) => n.id !== id));
+      });
   };
 
   return (
diff --git a/parts/2/renderingCollections/src/services/notes.js b/parts/2/renderingCollections/src/services/notes.js
index 1dd00a9..d0123c3 100644
--- a/parts/2/renderingCollections/src/services/notes.js
+++ b/parts/2/renderingCollections/src/services/notes.js
@@ -14,7 +14,7 @@ const update = (id, newObject) => {
 };
 
 export default {
-  getAll: getAll,
-  create: create,
-  update: update,
+  getAll,
+  create,
+  update,
 };