1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/signatureobject/SignatureObjectHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/signatureobject/SignatureObjectHelper.java
index 1eb432e..bb5dc86 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/signatureobject/SignatureObjectHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/signatureobject/SignatureObjectHelper.java
@@ -3,11 +3,12 @@
  */
 package at.knowcenter.wag.egov.egiz.sig.signatureobject;
 
+import at.gv.egiz.pdfas.exceptions.ErrorCode;
 import at.knowcenter.wag.egov.egiz.PdfASID;
-import at.knowcenter.wag.egov.egiz.exceptions.InvalidIDException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureTypesException;
 import at.knowcenter.wag.egov.egiz.sig.SignatureObject;
+import at.knowcenter.wag.egov.egiz.sig.X509Cert;
 import at.knowcenter.wag.egov.egiz.sig.connectors.bku.SignSignatureObject;
 
 /**
@@ -31,17 +32,24 @@ public final class SignatureObjectHelper
     so.setSignationIDs(sso.getSigID());
     so.setKZ(new PdfASID(sso.getSigKZ()));
     so.setSignationName(sso.getName());
+    
+    so.setX509Certificate(sso.getX509Certificate());
 
     return so;
   }
   
-  public static SignSignatureObject convertSignatureObjectToSignSignatureObject (SignatureObject so) throws InvalidIDException
+  public static SignSignatureObject convertSignatureObjectToSignSignatureObject (SignatureObject so) throws SignatureException
   {
     SignSignatureObject sso = new SignSignatureObject();
     sso.date = so.getSignationDate();
     sso.signatureValue = so.getSignationValue();
     sso.issuer = so.getSignationIssuer();
-    sso.x509Certificate = so.getX509Cert().getX509Certificate();
+    X509Cert cert = so.getX509Cert();
+    if (cert == null)
+    {
+      throw new SignatureException(ErrorCode.CERTIFICATE_NOT_FOUND, "so.getX509Cert returned null. No cert found.");
+    }
+    sso.x509Certificate = cert.getX509Certificate();
     sso.id = so.getSignationIds();
     sso.kz = so.getKZ() == null ? null : so.getKZ().toString();