diff --git a/Server/Core/Commands/MiscHandler.cs b/Server/Core/Commands/MiscHandler.cs
index 33f8c889..963f177d 100644
--- a/Server/Core/Commands/MiscHandler.cs
+++ b/Server/Core/Commands/MiscHandler.cs
@@ -11,7 +11,7 @@ public static partial class CommandHandler
     {
         public static void HandleShellCommandResponse(Client client, ShellCommandResponse packet)
         {
-            if (client.Value.FrmRs == null)
+            if (client.Value.FrmRs == null || string.IsNullOrEmpty(packet.Output))
                 return;
 
             if (packet.IsError)
@@ -22,6 +22,9 @@ public static void HandleShellCommandResponse(Client client, ShellCommandRespons
 
         public static void HandleDownloadFileResponse(Client client, DownloadFileResponse packet)
         {
+            if (string.IsNullOrEmpty(packet.Filename))
+                return;
+
             if (!Directory.Exists(client.Value.DownloadDirectory))
                 Directory.CreateDirectory(client.Value.DownloadDirectory);