diff --git a/Elwig/Helpers/Export/ElwigData.cs b/Elwig/Helpers/Export/ElwigData.cs
index 5dffb2f..8480ca3 100644
--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@@ -783,15 +783,15 @@ namespace Elwig.Helpers.Export {
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
-                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
+                var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
                 var ried = p["ried"]?.AsValue().GetValue<string>();
                 WbRd? rd = null;
-                if (ried != null) {
-                    var rde = riede.GetValueOrDefault(kgnr, []);
+                if (ried != null && kgnr != null) {
+                    var rde = riede.GetValueOrDefault(kgnr.Value, []);
                     rd = rde.FirstOrDefault(r => r.Name == ried);
                     if (rd == null) {
                         rd = new WbRd {
-                            KgNr = kgnr,
+                            KgNr = kgnr.Value,
                             RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
                             Name = ried,
                         };