diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs
index 7dbf6b6b..d534f527 100644
--- a/TShockAPI/Properties/AssemblyInfo.cs
+++ b/TShockAPI/Properties/AssemblyInfo.cs
@@ -35,5 +35,6 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.4.0.1221")]
-[assembly: AssemblyFileVersion("3.4.0.1221")]
+[assembly: AssemblyVersion("3.4.1.1221")]
+[assembly: AssemblyFileVersion("3.4.1.1221")]
+
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index c25ea3ed..ff7a6eda 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -295,7 +295,10 @@ namespace TShockAPI
         {
             if (disposing)
             {
-                Geo.Dispose();
+				if (Geo != null)
+				{
+					Geo.Dispose();					
+				}
                 GameHooks.PostInitialize -= OnPostInit;
                 GameHooks.Update -= OnUpdate;
                 ServerHooks.Join -= OnJoin;