X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FAssurancesDisplay.java;h=92acc6d843658c56c0f912c60179d294c0c0c218;hb=94873b38eefdc9ab7e803e7917580b1ee55288bf;hp=f6d5362a62a4d0223f8a5a2122187616b5d20154;hpb=a32ac88a108c3e48ee082bf278440ccd1a1c63f9;p=gigi.git

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index f6d5362a..92acc6d8 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -51,7 +51,7 @@ public class AssurancesDisplay implements Outputable {
                     vars.put("method", assurance.getMethod());
                     Name to = assurance.getTo();
                     if (assurer) {
-                        vars.put("linkId", assurance.getTo().getOwner().getId());
+                        vars.put("linkId", to == null ? "" : to.getOwner().getId());
                         vars.put("verbVal", to == null ? l.getTranslation("applicant's name removed") : to.getOwner().getId());
                         vars.put("myName", to == null ? l.getTranslation("applicant's name removed") : to);
                     } else {
@@ -60,7 +60,7 @@ public class AssurancesDisplay implements Outputable {
                         vars.put("myName", to == null ? l.getTranslation("own name removed") : to);
                     }
                     vars.put("date", assurance.getDate());
-                    vars.put("location", assurance.getLocation());
+                    vars.put("location", assurance.getLocation() + " (" + (assurance.getCountry() == null ? l.getTranslation("not given") : assurance.getCountry().getCountry()) + ")");
                     vars.put("points", assurance.getPoints());
                     i++;
                     return true;