diff --git a/Discord Media Loader.Application/MainForm.cs b/Discord Media Loader.Application/MainForm.cs
index 066e464..6eb5b0f 100644
--- a/Discord Media Loader.Application/MainForm.cs	
+++ b/Discord Media Loader.Application/MainForm.cs	
@@ -56,7 +56,7 @@ namespace DML.Application
             foreach (var job in Core.Scheduler.JobList)
             {
                 lbxJobs.Items.Add(
-                    $"{FindServerById(job.GuildId).Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId).Name}");
+                    $"{FindServerById(job.GuildId)?.Name}:{FindChannelById(FindServerById(job.GuildId), job.ChannelId)?.Name}");
             }
             lbxJobs.SelectedIndex = oldIndex;
         }
diff --git a/Discord Media Loader.Application/Properties/AssemblyInfo.cs b/Discord Media Loader.Application/Properties/AssemblyInfo.cs
index f37a353..6e17f64 100644
--- a/Discord Media Loader.Application/Properties/AssemblyInfo.cs	
+++ b/Discord Media Loader.Application/Properties/AssemblyInfo.cs	
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.148.0")]
-[assembly: AssemblyFileVersion("0.2.148.0")]
+[assembly: AssemblyVersion("0.99.148.0")]
+[assembly: AssemblyFileVersion("0.99.148.0")]
diff --git a/Discord Media Loader/FrmSplash.cs b/Discord Media Loader/FrmSplash.cs
index 2c55f11..8d0957b 100644
--- a/Discord Media Loader/FrmSplash.cs	
+++ b/Discord Media Loader/FrmSplash.cs	
@@ -34,7 +34,22 @@ namespace Discord_Media_Loader
                     downloadManager.StartDownload();
                     downloadManager.ShowDialog();
 
-                    ZipFile.ExtractToDirectory(tmpFile, AppDomain.CurrentDomain.BaseDirectory);
+                    var tmpFolder = Path.GetTempFileName();
+                    tmpFolder = Path.Combine(Path.GetFullPath(tmpFolder).Replace(Path.GetFileName(tmpFolder),""), Path.GetFileNameWithoutExtension(tmpFolder));
+
+                    var di = Directory.CreateDirectory(tmpFolder);
+
+                    ZipFile.ExtractToDirectory(tmpFile, tmpFolder);
+
+                    foreach (var f in di.GetFiles())
+                    {
+                        try
+                        {
+                            var fname = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, f.Name);
+                            File.Copy(f.FullName, fname, true);
+                        }
+                        catch (Exception) { }
+                    }
 
                     File.Delete(tmpFile);
                 }