diff --git a/memory/FileSystemMessage.cpp b/memory/FileSystemMessage.cpp
index 0d1421fa..951836e9 100644
--- a/memory/FileSystemMessage.cpp
+++ b/memory/FileSystemMessage.cpp
@@ -50,8 +50,12 @@ store_address_t FileSystemMessage::getStoreId(const CommandMessage* message) {
 	return temp;
 }
 
-void FileSystemMessage::setCompletionReply(CommandMessage* message,
-		Command_t completionStatus) {
-	message->setCommand(completionStatus);
+void FileSystemMessage::setSuccessReply(CommandMessage *message) {
+    message->setCommand(COMPLETION_SUCCESS);
 }
 
+void FileSystemMessage::setFailureReply(CommandMessage *message,
+        ReturnValue_t errorCode) {
+    message->setCommand(COMPLETION_SUCCESS);
+    message->setParameter(errorCode);
+}
diff --git a/memory/FileSystemMessage.h b/memory/FileSystemMessage.h
index 348c9409..6508f6be 100644
--- a/memory/FileSystemMessage.h
+++ b/memory/FileSystemMessage.h
@@ -30,7 +30,8 @@ public:
 	static ReturnValue_t setReadCommand(CommandMessage* message, store_address_t storageID);
 	static ReturnValue_t setReadReply(CommandMessage* message, store_address_t storageID);
 	static store_address_t getStoreId( const CommandMessage* message );
-	static void setCompletionReply(CommandMessage* message, Command_t completionStatus);
+	static void setSuccessReply(CommandMessage* message);
+	static void setFailureReply(CommandMessage* message, ReturnValue_t errorCode);
 };
 
 #endif /* FSFW_MEMORY_FILESYSTEMMESSAGE_H_ */