diff --git a/src/Destructurama.JsonNet.Tests/JsonNetTypesDestructuringTests.cs b/src/Destructurama.JsonNet.Tests/JsonNetTypesDestructuringTests.cs
index 346e7c6..470820c 100644
--- a/src/Destructurama.JsonNet.Tests/JsonNetTypesDestructuringTests.cs
+++ b/src/Destructurama.JsonNet.Tests/JsonNetTypesDestructuringTests.cs
@@ -28,8 +28,10 @@ internal class HasName
 
 public class JsonNetTypesDestructuringTests
 {
-    [Fact]
-    public void AttributesAreConsultedWhenDestructuring()
+    [Theory]
+    [InlineData(TypeNameHandling.Auto)]
+    [InlineData(TypeNameHandling.Objects)]
+    public void AttributesAreConsultedWhenDestructuring(TypeNameHandling typeNameHandling)
     {
         LogEvent evt = null!;
 
@@ -51,7 +53,7 @@ public void AttributesAreConsultedWhenDestructuring()
 
         string ser = JsonConvert.SerializeObject(test, new JsonSerializerSettings
         {
-            TypeNameHandling = TypeNameHandling.Auto
+            TypeNameHandling = typeNameHandling
         });
         var dyn = JsonConvert.DeserializeObject<dynamic>(ser);
 
@@ -67,5 +69,20 @@ public void AttributesAreConsultedWhenDestructuring()
         props["E"].LiteralValue().ShouldBeNull();
         props["ESPN"].ShouldBeOfType<DictionaryValue>();
         props["WSPN"].ShouldBeOfType<DictionaryValue>();
+
+        foreach (var value in props.Values.OfType<StructureValue>())
+        {
+            if (typeNameHandling == TypeNameHandling.Auto)
+                value.TypeTag.ShouldBeNull();
+            else if (typeNameHandling == TypeNameHandling.Objects)
+                value.TypeTag.ShouldNotBeNull();
+        }
+    }
+
+    [Fact]
+    public void TryDestructure_Should_Return_False_When_Called_With_Null()
+    {
+        var policy = new JsonNetDestructuringPolicy();
+        policy.TryDestructure(null!, null!, out _).ShouldBeFalse();
     }
 }
diff --git a/src/Destructurama.JsonNet/Destructurama.JsonNet.csproj b/src/Destructurama.JsonNet/Destructurama.JsonNet.csproj
index e4f857b..b37a8f5 100644
--- a/src/Destructurama.JsonNet/Destructurama.JsonNet.csproj
+++ b/src/Destructurama.JsonNet/Destructurama.JsonNet.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
+    <InternalsVisibleTo Include="Destructurama.JsonNet.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000fe215af9b769897395aac526ca6744222fcf543787b16f58980844d6c49f65bbf0a62502d69646c58f14a8a29ba60d43c85a2a5ef1ed103c9a0e18d6491e4b0bafd2c25e290028d19203d4366ae5651aafd48abaf485588fd6a25fbe23c2c9a644a24337a041966b09cbb73dc3a080bf79564d15a26e97c1bff4f345ee256a9" />
     <InternalsVisibleTo Include="Benchmarks, PublicKey=00240000048000009400000006020000002400005253413100040000010001000fe215af9b769897395aac526ca6744222fcf543787b16f58980844d6c49f65bbf0a62502d69646c58f14a8a29ba60d43c85a2a5ef1ed103c9a0e18d6491e4b0bafd2c25e290028d19203d4366ae5651aafd48abaf485588fd6a25fbe23c2c9a644a24337a041966b09cbb73dc3a080bf79564d15a26e97c1bff4f345ee256a9" />
   </ItemGroup>