diff --git a/Robust.Server/Toolshed/Commands/Players/PlayersCommand.cs b/Robust.Server/Toolshed/Commands/Players/PlayersCommand.cs
index 6ff6c1040a..6b82b00564 100644
--- a/Robust.Server/Toolshed/Commands/Players/PlayersCommand.cs
+++ b/Robust.Server/Toolshed/Commands/Players/PlayersCommand.cs
@@ -81,7 +81,7 @@ public record struct NoSuchPlayerError(string Username) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup($"No player with the username/GUID {Username} could be found.");
+        return FormattedMessage.FromUnformatted($"No player with the username/GUID {Username} could be found.");
     }
 
     public string? Expression { get; set; }
diff --git a/Robust.Shared/Toolshed/Syntax/Block.cs b/Robust.Shared/Toolshed/Syntax/Block.cs
index eeb2c04d4c..b6d3264a04 100644
--- a/Robust.Shared/Toolshed/Syntax/Block.cs
+++ b/Robust.Shared/Toolshed/Syntax/Block.cs
@@ -134,7 +134,7 @@ public record struct MissingClosingBrace() : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup("Expected a closing brace.");
+        return FormattedMessage.FromUnformatted("Expected a closing brace.");
     }
 
     public string? Expression { get; set; }
diff --git a/Robust.Shared/Toolshed/Syntax/Expression.cs b/Robust.Shared/Toolshed/Syntax/Expression.cs
index 8472ddfd4b..5e603a8c07 100644
--- a/Robust.Shared/Toolshed/Syntax/Expression.cs
+++ b/Robust.Shared/Toolshed/Syntax/Expression.cs
@@ -182,7 +182,7 @@ public record struct ExpressionOfWrongType(Type Expected, Type Got, bool Once) :
 {
     public FormattedMessage DescribeInner()
     {
-        var msg = FormattedMessage.FromMarkup(
+        var msg = FormattedMessage.FromUnformatted(
             $"Expected an expression of type {Expected.PrettyName()}, but got {Got.PrettyName()}");
 
         if (Once)
diff --git a/Robust.Shared/Toolshed/Syntax/ParsedCommand.cs b/Robust.Shared/Toolshed/Syntax/ParsedCommand.cs
index c4b695132e..c061fe62de 100644
--- a/Robust.Shared/Toolshed/Syntax/ParsedCommand.cs
+++ b/Robust.Shared/Toolshed/Syntax/ParsedCommand.cs
@@ -240,7 +240,7 @@ public record struct UnknownCommandError(string Cmd) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup($"Got unknown command {Cmd}.");
+        return FormattedMessage.FromUnformatted($"Got unknown command {Cmd}.");
     }
 
     public string? Expression { get; set; }
@@ -252,7 +252,7 @@ public record NoImplementationError(string Cmd, Type[] Types, string? SubCommand
 {
     public FormattedMessage DescribeInner()
     {
-        var msg = FormattedMessage.FromMarkup($"Could not find an implementation for {Cmd} given the input type {PipedType?.PrettyName() ?? "void"}.");
+        var msg = FormattedMessage.FromUnformatted($"Could not find an implementation for {Cmd} given the input type {PipedType?.PrettyName() ?? "void"}.");
         msg.PushNewline();
 
         var typeArgs = "";
diff --git a/Robust.Shared/Toolshed/ToolshedManager.Parsing.cs b/Robust.Shared/Toolshed/ToolshedManager.Parsing.cs
index 78192b55e4..b346c99a8f 100644
--- a/Robust.Shared/Toolshed/ToolshedManager.Parsing.cs
+++ b/Robust.Shared/Toolshed/ToolshedManager.Parsing.cs
@@ -181,17 +181,17 @@ public record UnparseableValueError(Type T) : IConError
 
         if (T.Constructable())
         {
-            var msg = FormattedMessage.FromMarkup(
+            var msg = FormattedMessage.FromUnformatted(
                 $"The type {T.PrettyName()} has no parser available and cannot be parsed.");
             msg.PushNewline();
             msg.AddText("Please contact a programmer with this error, they'd probably like to see it.");
             msg.PushNewline();
-            msg.AddMarkup("[bold][color=red]THIS IS A BUG.[/color][/bold]");
+            msg.AddMarkupOrThrow("[bold][color=red]THIS IS A BUG.[/color][/bold]");
             return msg;
         }
         else
         {
-            return FormattedMessage.FromMarkup($"The type {T.PrettyName()} cannot be parsed, as it cannot be constructed.");
+            return FormattedMessage.FromUnformatted($"The type {T.PrettyName()} cannot be parsed, as it cannot be constructed.");
         }
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/BoolTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/BoolTypeParser.cs
index f5aa55f7d0..5a929af08e 100644
--- a/Robust.Shared/Toolshed/TypeParsers/BoolTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/BoolTypeParser.cs
@@ -60,7 +60,7 @@ public record InvalidBool(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup(
+        return FormattedMessage.FromUnformatted(
             $"The value {Value} is not a valid boolean.");
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/ComponentTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/ComponentTypeParser.cs
index 8acde11156..fd8cad9428 100644
--- a/Robust.Shared/Toolshed/TypeParsers/ComponentTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/ComponentTypeParser.cs
@@ -61,7 +61,7 @@ public record struct UnknownComponentError(string Component) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        var msg = FormattedMessage.FromMarkup(
+        var msg = FormattedMessage.FromUnformatted(
             $"Unknown component {Component}. For a list of all components, try types:components."
             );
         if (Component.EndsWith("component", true, CultureInfo.InvariantCulture))
diff --git a/Robust.Shared/Toolshed/TypeParsers/EntityTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/EntityTypeParser.cs
index d270e28ad0..e5b40e1107 100644
--- a/Robust.Shared/Toolshed/TypeParsers/EntityTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/EntityTypeParser.cs
@@ -49,7 +49,7 @@ public record InvalidEntity(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup($"Couldn't parse {Value} as an Entity.");
+        return FormattedMessage.FromUnformatted($"Couldn't parse {Value} as an Entity.");
     }
 
     public string? Expression { get; set; }
@@ -61,7 +61,7 @@ public record DeadEntity(EntityUid Entity) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup($"The entity {Entity} does not exist.");
+        return FormattedMessage.FromUnformatted($"The entity {Entity} does not exist.");
     }
 
     public string? Expression { get; set; }
diff --git a/Robust.Shared/Toolshed/TypeParsers/EnumTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/EnumTypeParser.cs
index 0b5e0029c6..4a416daaee 100644
--- a/Robust.Shared/Toolshed/TypeParsers/EnumTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/EnumTypeParser.cs
@@ -57,7 +57,7 @@ public record InvalidEnum<T>(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        var msg = FormattedMessage.FromMarkup($"The value {Value} is not a valid {typeof(T).PrettyName()}.");
+        var msg = FormattedMessage.FromUnformatted($"The value {Value} is not a valid {typeof(T).PrettyName()}.");
         msg.AddText($"Valid values are: {string.Join(", ", Enum.GetNames<T>())}");
         return msg;
     }
diff --git a/Robust.Shared/Toolshed/TypeParsers/Math/AngleTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/Math/AngleTypeParser.cs
index 8885fff5bd..f69839a5b1 100644
--- a/Robust.Shared/Toolshed/TypeParsers/Math/AngleTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/Math/AngleTypeParser.cs
@@ -70,7 +70,7 @@ public record InvalidAngle(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup(
+        return FormattedMessage.FromUnformatted(
             $"The value {Value} is not a valid angle.");
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/Math/ColorTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/Math/ColorTypeParser.cs
index 1e628d59dc..7aac2c5e03 100644
--- a/Robust.Shared/Toolshed/TypeParsers/Math/ColorTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/Math/ColorTypeParser.cs
@@ -60,7 +60,7 @@ public record InvalidColor(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup(
+        return FormattedMessage.FromUnformatted(
             $"The value {Value} is not a valid RGB color or name of color.");
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/Math/NumberBaseTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/Math/NumberBaseTypeParser.cs
index 57b0577cae..bac588db16 100644
--- a/Robust.Shared/Toolshed/TypeParsers/Math/NumberBaseTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/Math/NumberBaseTypeParser.cs
@@ -56,7 +56,7 @@ public record InvalidNumber<T>(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup(
+        return FormattedMessage.FromUnformatted(
             $"The value {Value} is not a valid {typeof(T).PrettyName()}.");
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/Math/SpanLikeTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/Math/SpanLikeTypeParser.cs
index 9f9340acc9..34199ece3a 100644
--- a/Robust.Shared/Toolshed/TypeParsers/Math/SpanLikeTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/Math/SpanLikeTypeParser.cs
@@ -97,7 +97,7 @@ public record UnexpectedCloseBrace : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup("Unexpected closing brace.");
+        return FormattedMessage.FromUnformatted("Unexpected closing brace.");
     }
 
     public string? Expression { get; set; }
diff --git a/Robust.Shared/Toolshed/TypeParsers/PrototypeTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/PrototypeTypeParser.cs
index c8dcb62cdf..56f28aae56 100644
--- a/Robust.Shared/Toolshed/TypeParsers/PrototypeTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/PrototypeTypeParser.cs
@@ -69,7 +69,7 @@ public record NotAValidPrototype(string Proto, string Kind) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup($"{Proto} is not a valid {Kind} prototype");
+        return FormattedMessage.FromUnformatted($"{Proto} is not a valid {Kind} prototype");
     }
 
     public string? Expression { get; set; }
diff --git a/Robust.Shared/Toolshed/TypeParsers/QuantityTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/QuantityTypeParser.cs
index f07033c2d2..ac38a8345c 100644
--- a/Robust.Shared/Toolshed/TypeParsers/QuantityTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/QuantityTypeParser.cs
@@ -64,7 +64,7 @@ public record InvalidQuantity(string Value) : IConError
 {
     public FormattedMessage DescribeInner()
     {
-        return FormattedMessage.FromMarkup(
+        return FormattedMessage.FromUnformatted(
             $"The value {Value} is not a valid quantity. Please input some decimal number, optionally with a % to indicate that it's a percentage.");
     }
 
diff --git a/Robust.Shared/Toolshed/TypeParsers/SessionTypeParser.cs b/Robust.Shared/Toolshed/TypeParsers/SessionTypeParser.cs
index 69524e841d..06f5d5a195 100644
--- a/Robust.Shared/Toolshed/TypeParsers/SessionTypeParser.cs
+++ b/Robust.Shared/Toolshed/TypeParsers/SessionTypeParser.cs
@@ -54,7 +54,7 @@ internal sealed class SessionTypeParser : TypeParser<ICommonSession>
     {
         public FormattedMessage DescribeInner()
         {
-            return FormattedMessage.FromMarkup(Loc.GetString("cmd-parse-failure-session", ("username", Username)));
+            return FormattedMessage.FromUnformatted(Loc.GetString("cmd-parse-failure-session", ("username", Username)));
         }
 
         public string? Expression { get; set; }