diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index 08505e9..6dcc392 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -1523,7 +1523,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form2, "1_11_m", commonField.getOthers().get("maritalStatusMarried"));
         setValueIfPresent(form2, "1_11_o", commonField.getOthers().get("maritalStatusOther"));
 
-        if("Yes".contentEquals(commonField.getOthers().get("hkidPerm")) || "Yes".contentEquals(commonField.getOthers().get("hkidNon"))){
+        if("Yes".equals(commonField.getOthers().get("hkidPerm")) 
+            || "Yes".equals(commonField.getOthers().get("hkidNon"))
+        ){
             setValueIfPresent(form2, "1_10_1", commonField.getOthers().get("hkidPerm"));
             setValueIfPresent(form2, "1_10_2", commonField.getOthers().get("hkidNon"));
         }else if("Yes".equals(commonField.getOthers().get("prcId"))){
@@ -2111,8 +2113,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form2, "male", commonField.getGenderMale());
         setValueIfPresent(form2, "female", commonField.getGenderFemale());
         
-        if(!"".equals(StringUtils.trimToEmpty(commonField.getPlaceOfBirth()))
-            || !"".equals(commonField.getCountryOfCitizenship())){
+        if((commonField.getPlaceOfBirth() != null && !"".equals(StringUtils.trimToEmpty(commonField.getPlaceOfBirth())))
+            || (commonField.getCountryOfCitizenship() != null && !"".equals(commonField.getCountryOfCitizenship()))
+        ){
             if("HONG KONG".equals(commonField.getPlaceOfBirth().toUpperCase())
                 || "HK".equals(commonField.getPlaceOfBirth().toUpperCase())
                 || "HONGKONG".equals(commonField.getPlaceOfBirth().toUpperCase())