diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index d905aa52..ca44537c 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -5615,7 +5615,8 @@
Discord Bot Error
- The discord bot requires a valid token so it can log into the discord server\r\nThis can be set in the global settings.
+ The discord bot requires a valid token so it can log into the discord server.\r\nThis can be set in the global settings.
+ The discord bot requires a valid prefix.\r\nThis can be set in the global settings.
The discord bot prefix contains invalid characters. Only letters and numbers are allowed.
Command '{0}' has not been enabled.
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index ddb3222f..e9f34170 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -1263,6 +1263,7 @@
Discord Bot Error
The discord bot requires a valid token so it can log into the discord server\r\nThis can be set in the global settings.
+ The discord bot requires a valid prefix.\r\nThis can be set in the global settings.
The discord bot prefix contains invalid characters. Only letters and numbers are allowed.
Command '{0}' has not been enabled.
diff --git a/src/ServerManager.Discord/ServerManagerBot.cs b/src/ServerManager.Discord/ServerManagerBot.cs
index 41684c39..c300e349 100644
--- a/src/ServerManager.Discord/ServerManagerBot.cs
+++ b/src/ServerManager.Discord/ServerManagerBot.cs
@@ -30,12 +30,17 @@ namespace ServerManagerTool.DiscordBot
public async Task StartAsync(LogLevel logLevel, string discordToken, string commandPrefix, string dataDirectory, bool allowAllBots, IEnumerable botWhitelist, HandleCommandDelegate handleCommandCallback, HandleTranslationDelegate handleTranslationCallback, CancellationToken token)
{
- if (string.IsNullOrWhiteSpace(commandPrefix) || string.IsNullOrWhiteSpace(discordToken) || handleTranslationCallback is null || handleCommandCallback is null)
+ if (string.IsNullOrWhiteSpace(discordToken))
{
- return;
+ throw new Exception("#DiscordBot_MissingTokenError");
}
- if (Started)
+ if (string.IsNullOrWhiteSpace(commandPrefix))
+ {
+ throw new Exception("#DiscordBot_MissingPrefixError");
+ }
+
+ if (Started || handleTranslationCallback is null || handleCommandCallback is null)
{
return;
}