diff --git a/MLEM.Ui/Elements/Tooltip.cs b/MLEM.Ui/Elements/Tooltip.cs
index 087df92..3b34b11 100644
--- a/MLEM.Ui/Elements/Tooltip.cs
+++ b/MLEM.Ui/Elements/Tooltip.cs
@@ -17,7 +17,10 @@ namespace MLEM.Ui.Elements {
 
             if (elementToHover != null) {
                 elementToHover.OnMouseEnter += element => element.System.Add(element.GetType().Name + "Tooltip", this).CanSelectContent = false;
-                elementToHover.OnMouseExit += element => element.System.Remove(element.GetType().Name + "Tooltip");
+                elementToHover.OnMouseExit += element => {
+                    if (this.System != null)
+                        this.System.Remove(element.GetType().Name + "Tooltip");
+                };
             }
         }
 
diff --git a/MLEM.Ui/MLEM.Ui.csproj b/MLEM.Ui/MLEM.Ui.csproj
index 8ee3f58..4eed3af 100644
--- a/MLEM.Ui/MLEM.Ui.csproj
+++ b/MLEM.Ui/MLEM.Ui.csproj
@@ -10,7 +10,7 @@
         <PackageProjectUrl>https://github.com/Ellpeck/MLEM</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
         <PackageLicenseUrl>https://github.com/Ellpeck/MLEM/blob/master/LICENSE</PackageLicenseUrl>
-        <Version>1.1.5</Version>
+        <Version>1.1.6</Version>
     </PropertyGroup>
 
     <ItemGroup>