diff --git a/.idea/runConfigurations/Tomcat__1__Rosso_Gargano_.xml b/.idea/runConfigurations/Tomcat__1__Rosso_Gargano_.xml
index b7514dcb46..324dbe2194 100644
--- a/.idea/runConfigurations/Tomcat__1__Rosso_Gargano_.xml
+++ b/.idea/runConfigurations/Tomcat__1__Rosso_Gargano_.xml
@@ -4,7 +4,7 @@
     <option name="USE_SOCKET_TRANSPORT" value="true" />
     <option name="SERVER_MODE" value="false" />
     <option name="SHMEM_ADDRESS" />
-    <option name="HOST" value="192.168.1.13" />
+    <option name="HOST" value="172.16.10.51" />
     <option name="PORT" value="8001" />
     <option name="AUTO_RESTART" value="false" />
     <RunnerSettings RunnerId="Debug">
diff --git a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/structure/ExchangeImportDataManagerService.java b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/structure/ExchangeImportDataManagerService.java
index 00e212df2e..3d007bf6a4 100644
--- a/ems-engine/src/main/java/it/integry/ems/system/exchange/service/structure/ExchangeImportDataManagerService.java
+++ b/ems-engine/src/main/java/it/integry/ems/system/exchange/service/structure/ExchangeImportDataManagerService.java
@@ -126,6 +126,8 @@ public class ExchangeImportDataManagerService {
             for (EquatableEntityInterface item : itemsToDelete) {
                 Object child = parentField.get(item);
 
+                if(child == null) continue;
+
                 if (child instanceof List) {
                     List<EntityBase> childList = (List<EntityBase>) child;
                     childList