Merge branch 'master' into develop

ems-core/src/main/java/it/integry/ems/sync/AsyncHistoryManager.java

@@ -158,6 +158,8 @@ public class AsyncHistoryManager {
             for (Field entityChildField : childs) {
                 try {
                     Object entityChildRef = entityChildField.get(data);
+                    if(entityChildRef == null) continue;
+
                     if (entityChildRef instanceof List) {
                         for (EntityBase entityChild : (List<EntityBase>) entityChildRef) {
                             entityChild.setOnlyPkMaster(false);
@@ -165,7 +167,7 @@ public class AsyncHistoryManager {
                     } else
                         ((EntityBase) entityChildRef).setOnlyPkMaster(false);
                 } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
+                    logger.error("Sync", e);
                 }
             }