diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index db0ddcbc..9d7a6daa 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -19,6 +19,7 @@ import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -156,7 +157,7 @@ public class ApplicationEvaluationDao {
             amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId());
             String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument();
             String formField=applicationAmendmentRequestEntity.getFormFields();
-            if (amendmentDocument != null) {
+            if (Boolean.FALSE.equals(StringUtils.isEmpty(amendmentDocument))) {
                 List<AmendmentFieldRequest> amendmentFieldRequests=Utils.convertJsonStringToList(amendmentDocument,AmendmentFieldRequest.class);
                 List<AmendmentDocumentResponse> amendmentDocumentResponses = amendmentFieldRequests.stream()
                         .map(applicationAmendmentRequestDao::createAmendmentDocumentResponse)