4 files changed, 8 insertions, 7 deletions
diff --git a/modules/memoserv/ignore.cpp b/modules/memoserv/ignore.cpp
index 3a334975d..34e862716 100644
--- a/modules/memoserv/ignore.cpp
+++ b/modules/memoserv/ignore.cpp
@@ -131,7 +131,7 @@ class CommandMSIgnore : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, "");
+			this->OnSyntaxError(source);
 		}
 	}
 
diff --git a/modules/memoserv/list.cpp b/modules/memoserv/list.cpp
index 4de956d75..14027fa7b 100644
--- a/modules/memoserv/list.cpp
+++ b/modules/memoserv/list.cpp
@@ -62,7 +62,7 @@ class CommandMSList : public Command
 
 		if (!param.empty() && !isdigit(param[0]) && !param.equals_ci("NEW"))
 		{
-			this->OnSyntaxError(source, param);
+			this->OnSyntaxError(source);
 			return;
 		}
 
diff --git a/modules/memoserv/read.cpp b/modules/memoserv/read.cpp
index 60fc98b0c..4a2168675 100644
--- a/modules/memoserv/read.cpp
+++ b/modules/memoserv/read.cpp
@@ -124,7 +124,7 @@ class CommandMSRead : public Command
 
 		if (numstr.empty() || (!numstr.equals_ci("LAST") && !numstr.equals_ci("NEW") && !numstr.equals_ci("ALL") && numstr.find_first_not_of("0123456789.,-") != Anope::string::npos))
 		{
-			this->OnSyntaxError(source, numstr);
+			this->OnSyntaxError(source);
 			return;
 		}
 
diff --git a/modules/memoserv/set.cpp b/modules/memoserv/set.cpp
index 08a807748..984cc2ef4 100644
--- a/modules/memoserv/set.cpp
+++ b/modules/memoserv/set.cpp
@@ -75,7 +75,7 @@ class CommandMSSet : public Command
 		}
 		else
 		{
-			this->OnSyntaxError(source, "");
+			this->OnSyntaxError(source, "NOTIFY");
 		}
 	}
 
@@ -132,7 +132,7 @@ class CommandMSSet : public Command
 			}
 			else if (p1.empty() || (!p1.is_pos_number_only() && !p1.equals_ci("NONE")) || (!p2.empty() && !p2.equals_ci("HARD")))
 			{
-				this->OnSyntaxError(source, "");
+				this->OnSyntaxError(source, "LIMIT");
 				return;
 			}
 			if (!chan.empty())
@@ -160,7 +160,7 @@ class CommandMSSet : public Command
 		{
 			if (p1.empty() || !p2.empty() || !isdigit(p1[0]))
 			{
-				this->OnSyntaxError(source, "");
+				this->OnSyntaxError(source, "LIMIT");
 				return;
 			}
 			if (!chan.empty() && mi->IsHardMax())
@@ -228,6 +228,7 @@ class CommandMSSet : public Command
 		const Anope::string &cmd = params[0];
 		MemoServ::MemoInfo *mi = source.nc->GetMemos();
 
+#warning "split this into subcommands"
 		if (Anope::ReadOnly)
 			source.Reply(_("Sorry, memo option setting is temporarily disabled."));
 		else if (cmd.equals_ci("NOTIFY"))
@@ -235,7 +236,7 @@ class CommandMSSet : public Command
 		else if (cmd.equals_ci("LIMIT"))
 			return this->DoLimit(source, params, mi);
 		else
-			this->OnSyntaxError(source, "");
+			this->OnSyntaxError(source);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override