diff --git a/DiscImageChef.Core/Statistics.cs b/DiscImageChef.Core/Statistics.cs
index 20b73cee..3eee5171 100644
--- a/DiscImageChef.Core/Statistics.cs
+++ b/DiscImageChef.Core/Statistics.cs
@@ -186,7 +186,7 @@ namespace DiscImageChef.Core
                 fs.Close();
             }
 
-            if(Settings.Settings.Current.Stats.ShareStats) SubmitStats();
+            if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats) SubmitStats();
         }
 
         /// <summary>
@@ -216,7 +216,7 @@ namespace DiscImageChef.Core
                         System.Console.WriteLine("Uploading partial statistics file {0}", statsFile);
                         #else
                     DiscImageChef.Console.DicConsole.DebugWriteLine("Submit stats", "Uploading partial statistics file {0}", statsFile);
-                                                #endif
+                                                                        #endif
 
                         FileStream    fs = new FileStream(statsFile, FileMode.Open, FileAccess.Read);
                         XmlSerializer xs = new XmlSerializer(stats.GetType());
@@ -258,7 +258,7 @@ namespace DiscImageChef.Core
                         throw;
                         #else
                         continue;
-                                                #endif
+                                                                                                #endif
                     }
 
                 submitStatsLock = false;
diff --git a/DiscImageChef/Main.cs b/DiscImageChef/Main.cs
index 793f0f30..6f6c5d51 100644
--- a/DiscImageChef/Main.cs
+++ b/DiscImageChef/Main.cs
@@ -49,7 +49,8 @@ namespace DiscImageChef
 
             Settings.Settings.LoadSettings();
             Statistics.LoadStats();
-            if(Settings.Settings.Current.Stats.ShareStats) Statistics.SubmitStats();
+            if(Settings.Settings.Current.Stats != null && Settings.Settings.Current.Stats.ShareStats)
+                Statistics.SubmitStats();
 
             Parser.Default.ParseArguments(args, typeof(AnalyzeOptions), typeof(BenchmarkOptions),
                                           typeof(ChecksumOptions), typeof(CompareOptions), typeof(ConfigureOptions),