diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
index f409d8709a..3051a81bb1 100644
--- a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
+++ b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
@@ -141,6 +141,10 @@ public abstract class BaseMigration implements MigrationModelInterface {
     }
 
     private void alterObject(SqlObjectTypeEnum sqlObject, String objectName, String sql) throws SQLException, IOException {
+        if (UtilityString.isNullOrEmpty(objectName)) {
+            throw new IllegalArgumentException("ObjectName in createOrUpdateFunction(), createOrUpdateView(), createOrUpdateTrigger(), createOrUpdateProcedure() cannot be null or empty");
+        }
+
         executeStatement("IF EXISTS (SELECT * FROM SYSOBJECTS WHERE id = object_id('" + objectName + "'))\r\n" +
                         "\tDROP " + sqlObject.toString() + " " + objectName,
                 sql);
diff --git a/ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java b/ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
index 913296f3fe..3b29f1d574 100644
--- a/ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
+++ b/ems-core/src/main/java/it/integry/ems/rules/completing/CommonRules.java
@@ -4,10 +4,7 @@ import com.annimon.stream.ComparatorCompat;
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import it.integry.common.var.CommonConstants;
-import it.integry.ems._context.ApplicationContextProvider;
-import it.integry.ems.dynamic_cache.EntityCacheComponent;
 import it.integry.ems.json.ResponseJSONObjectMapper;
-import it.integry.ems.migration._base.IntegryCustomerDB;
 import it.integry.ems.sync.MultiDBTransaction.Connection;
 import it.integry.ems_model.annotation.ReloadRow;
 import it.integry.ems_model.annotation.SqlField;
@@ -693,15 +690,10 @@ public class CommonRules extends QueryRules {
         return barcode;
     }
 
-    public static String completeFlagQtaCnfFissa(Connection connection, IntegryCustomerDB customerDB, String codMart) {
-        final EntityCacheComponent entityCacheComponent = ApplicationContextProvider.getApplicationContext().getBean(EntityCacheComponent.class);
-
-        final List<MtbAart> cachedMtbAarts = entityCacheComponent.getCachedEntitiesList(customerDB, MtbAart.ENTITY, x -> x.getCodMart().equals(codMart));
-
-        if (cachedMtbAarts == null || cachedMtbAarts.isEmpty())
-            return null;
-
-        return cachedMtbAarts.get(0).getFlagQtaCnfFissa();
+    public static String completeFlagQtaCnfFissa(Connection connection, String codMart) throws Exception {
+        String sql = "select flag_qta_cnf_fissa from mtb_aart WHERE cod_mart = '" + codMart + "'";
+        String flagQtaCnfFissa = UtilityDB.executeSimpleQueryOnlyFirstRowFirstColumn(connection, sql);
+        return flagQtaCnfFissa;
     }
 
     public static String getApplicationName(Connection connection) throws Exception {