diff --git a/MBBSEmu/CPU/RegistersStructs.cs b/MBBSEmu/CPU/RegistersStructs.cs
index 243dad63..db77a63a 100644
--- a/MBBSEmu/CPU/RegistersStructs.cs
+++ b/MBBSEmu/CPU/RegistersStructs.cs
@@ -520,6 +520,7 @@ public override string ToString()
             output.Append($"BX={this.BX:X4}  ");
             output.Append($"CX={this.CX:X4}  ");
             output.Append($"DX={this.DX:X4}  ");
+            output.Append($"CS={this.CS:X4}  ");
             output.Append($"DS={this.DS:X4}  ");
             output.AppendLine($"ES={this.ES:X4} ");
             output.Append($"SI={this.SI:X4}  ");
diff --git a/MBBSEmu/HostProcess/ExportedModules/Majorbbs.cs b/MBBSEmu/HostProcess/ExportedModules/Majorbbs.cs
index 7a99b0b9..95980f9b 100644
--- a/MBBSEmu/HostProcess/ExportedModules/Majorbbs.cs
+++ b/MBBSEmu/HostProcess/ExportedModules/Majorbbs.cs
@@ -4059,10 +4059,7 @@ private void catastro()
 
             var formattedMessage = FormatPrintf(message, 2);
 
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.BackgroundColor = ConsoleColor.Red;
-            Console.WriteLine($"{Encoding.ASCII.GetString(formattedMessage)}");
-            Console.ResetColor();
+            _logger.Error($"({Module.ModuleIdentifier}) Catastro Failure: {Encoding.ASCII.GetString(formattedMessage)}");
 
             Registers.Halt = true;
         }
diff --git a/MBBSEmu/HostProcess/MbbsHost.cs b/MBBSEmu/HostProcess/MbbsHost.cs
index f044c7c6..80da1f66 100644
--- a/MBBSEmu/HostProcess/MbbsHost.cs
+++ b/MBBSEmu/HostProcess/MbbsHost.cs
@@ -1362,7 +1362,7 @@ private void DisableModule(string moduleId, bool isCrashed = false)
             }
 
             //Notify Users and Exit Modules
-            foreach (var c in _channelDictionary.Values.Where(x => x.CurrentModule.ModuleIdentifier == moduleId))
+            foreach (var c in _channelDictionary.Values.Where(x => x.CurrentModule?.ModuleIdentifier == moduleId))
             {
                 if (isCrashed)
                 {