diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
index 080ed3d1..2ab22d1f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -735,13 +735,19 @@ public class ApplicationAmendmentRequestDao {
 
         ApplicationAmendmentRequestEntity oldApplicationAmendmentEntity = Utils.getClonedEntityForData(existingApplicationAmendment);
         setIfUpdated(existingApplicationAmendment::getNote, existingApplicationAmendment::setNote, updateRequest.getNote());
+        Map<String, AmendmentFormField> amendmentFormFieldMap;
+        Map<String, ApplicationFormFieldEntity> applicationFormFieldMap=null;
+        if(existingApplicationAmendment.getFormFields()!=null && Boolean.FALSE.equals(existingApplicationAmendment.getFormFields().isEmpty())) {
+            amendmentFormFieldMap = Utils
+                    .convertJsonStringToList(existingApplicationAmendment.getFormFields(), AmendmentFormField.class)
+                    .stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity()));
+           applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity()));
 
-		Map<String, AmendmentFormField> amendmentFormFieldMap = Utils
-				.convertJsonStringToList(existingApplicationAmendment.getFormFields(), AmendmentFormField.class)
-				.stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity()));
-		Map<String, ApplicationFormFieldEntity> applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity()));
+        } else {
+            amendmentFormFieldMap = null;
+        }
 
-		if(updateRequest.getApplicationFormFields() != null) {
+        if(updateRequest.getApplicationFormFields() != null && amendmentFormFieldMap!=null) {
 	        updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{
 	        	AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId());
 //	        	ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId());
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index bc453374..80e20599 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -10,7 +10,7 @@ spring.h2.console.enabled=true
 isVatCheckGloballyDisabled = false
 
 isMailSendingEnabled = true
-isPecServiceEnabled = false
+isPecServiceEnabled = true
 #default_System_Receiver_Email=antonio.manca@bflows.net
 gepafin_email=rinaldo.bonazzo@bflows.net
 rinaldo_email=rinaldo.bonazzo@bflows.net