diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index e4495d32..f045980f 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -94,6 +94,7 @@ namespace TShockAPI
         public override void Initialize()
         {
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
 #if DEBUG
             Log.Initialize(Path.Combine(SavePath, "log.txt"), LogLevel.All, false);
 #else
@@ -131,10 +132,10 @@ namespace TShockAPI
                         "';Pwd='" + Config.MySqlPassword + "';";
                     DB.Open();
                 }
-                catch(MySqlException ex)
+                catch (MySqlException ex)
                 {
                     Log.Error(ex.ToString());
-                    throw new Exception("MySql not setup correctly");                    
+                    throw new Exception("MySql not setup correctly");
                 }
             }
             else
diff --git a/TShockAPI/Tools.cs b/TShockAPI/Tools.cs
index 4d4cf390..b11a3b2a 100755
--- a/TShockAPI/Tools.cs
+++ b/TShockAPI/Tools.cs
@@ -106,7 +106,14 @@ namespace TShockAPI
         /// </summary>
         public static void SaveWorld()
         {
-            WorldGen.RealsaveWorld();
+            try
+            {
+                WorldGen.RealsaveWorld();
+            }
+            catch
+            {
+                WorldGen.saveWorld();
+            }
 
             Broadcast("World saved.", Color.Yellow);
             Log.Info(string.Format("World saved at ({0})", Main.worldPathName));