diff --git a/src/main/java/ctbrec/sites/mfc/X.java b/src/main/java/ctbrec/sites/mfc/X.java index db5175db..8b0b99ee 100644 --- a/src/main/java/ctbrec/sites/mfc/X.java +++ b/src/main/java/ctbrec/sites/mfc/X.java @@ -37,8 +37,12 @@ public class X { if(x == null) { return; } - fcext.merge(x.fcext); - share.merge(x.share); + if (fcext != null) { + fcext.merge(x.fcext); + } + if (share != null) { + share.merge(x.share); + } additionalProperties.putAll(x.additionalProperties); }