diff --git a/src/DStore.java b/src/DStore.java
index 70e2c7365753fe17ebd0dde99b013f573aa090a4..c80285ec0124fdca5b347d8206d938ed9a5220a8 100644
--- a/src/DStore.java
+++ b/src/DStore.java
@@ -111,11 +111,19 @@ public class DStore {
     }
 
     private static void removeFile(String filePath, String fileName){
-        //Remove file from folder
-        File file = new File(filePath+File.separator+fileName);
-        file.delete();
-
-        //Remove file from list
-        fileList.remove(fileName);
+        //If filename does not exist,
+        if(!fileList.contains(fileName)){
+            controller.println("ERROR_FILE_DOES_NOT_EXIST "+fileName);
+            controller.flush();
+        } else {
+            //Remove file from folder
+            File file = new File(filePath + File.separator + fileName);
+            file.delete();
+
+            //Remove file from list & send acknowledgement
+            fileList.remove(fileName);
+            controller.println("REMOVE_ACK "+fileName);
+            controller.flush();
+        }
     }
 }