diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
index 24ce6d55..e07a65d2 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -206,23 +206,27 @@ public class ApplicationEvaluationDao {
             amendmentDocumentResponseBean.setAmendmentId(applicationAmendmentRequestEntity.getId());
             String amendmentDocument=applicationAmendmentRequestEntity.getAmendmentDocument();
             String formField=applicationAmendmentRequestEntity.getFormFields();
-            AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class);
-            if (amendmentDetails != null) {
-                if (amendmentDetails.getAmendmentDocuments() != null) {
-                    List<DocumentResponseBean> documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(","))
-                            .map(String::trim)
-                            .filter(id -> !id.isEmpty())
-                            .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId))
-                            .filter(Objects::nonNull)
-                            .collect(Collectors.toList());
+            if (StringUtils.isNotBlank(amendmentDocument)) {
+                AmendmentDetailsResponseBean amendmentDetails = Utils.convertStringToObject(amendmentDocument, AmendmentDetailsResponseBean.class);
 
-                    amendmentDocumentResponseBean.setFileDetail(documentResponseBeans);
+                if (amendmentDetails != null) {
+                    if (StringUtils.isNotBlank(amendmentDetails.getAmendmentDocuments())) {
+                        List<DocumentResponseBean> documentResponseBeans = Arrays.stream(amendmentDetails.getAmendmentDocuments().split(","))
+                                .map(String::trim)
+                                .filter(id -> !id.isEmpty())
+                                .map(documentId -> applicationAmendmentRequestDao.createDocumentResponseBean(documentId))
+                                .filter(Objects::nonNull)
+                                .collect(Collectors.toList());
+                        amendmentDocumentResponseBean.setFileDetail(documentResponseBeans);
+                    }
+
+                    amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId());
+                    amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes());
+                    amendmentDocumentResponseBean.setValid(amendmentDetails.getValid());
+                    amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
                 }
-                amendmentDocumentResponseBean.setFieldId("amend_" + applicationAmendmentRequestEntity.getId());
-                amendmentDocumentResponseBean.setLabel(amendmentDetails.getAmendmentNotes());
-                amendmentDocumentResponseBean.setValid(amendmentDetails.getValid());
-                amendmentDocumentResponseBeans.add(amendmentDocumentResponseBean);
             }
+
             List<AmendmentFormField> amendmentFormFields = Utils.convertJsonStringToList(formField, AmendmentFormField.class);
             if (amendmentFormFields != null) {
                 for (AmendmentFormField amendmentFormField : amendmentFormFields) {