diff --git a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
index a2e437cd..eda1d70f 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/PdfDao.java
@@ -339,8 +339,9 @@ public class PdfDao {
                 for (String key : orderedKeys) {
                     if (stateFieldMap.containsKey(key)) {  // Only add data cell if key is in stateFieldMap
                         Object value = row.getOrDefault(key, ""); // Fetch value or use empty string if key not present
-                      String fieldValue= (String) value;
-                                if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
+//                      String fieldValue= (String) value;
+                        String fieldValue = value != null ? value.toString() : "";
+                      if(Boolean.TRUE.equals(Utils.isItalianFormattedAmount(fieldValue))  ){
                             fieldValue= String.valueOf(Utils.convertToItalianFormat(fieldValue));
                         }
 //                      PdfPCell dataCell = new PdfPCell(new Phrase(fieldValue != null ?fieldValue: "", textFont));