diff --git a/osc/build.py b/osc/build.py
index b0df9af1..40d2e376 100644
--- a/osc/build.py
+++ b/osc/build.py
@@ -732,7 +732,7 @@ def create_build_descr_data(
                 result_data.append((b"_service", f.read()))
 
     if not result_data and not prefer_pkgs:
-        return None, None
+        return None, {}
 
     cpio_data = cpio.CpioWrite()
     for key, value in result_data:
diff --git a/osc/obs_api/keyinfo_sslcert.py b/osc/obs_api/keyinfo_sslcert.py
index 8101056c..cfbf2fba 100644
--- a/osc/obs_api/keyinfo_sslcert.py
+++ b/osc/obs_api/keyinfo_sslcert.py
@@ -4,7 +4,7 @@ from ..util.models import *  # pylint: disable=wildcard-import,unused-wildcard-i
 class KeyinfoSslcert(XmlModel):
     XML_TAG = "sslcert"
 
-    keyid: str = Field(
+    keyid: Optional[str] = Field(
         xml_attribute=True,
     )
 
@@ -36,7 +36,7 @@ class KeyinfoSslcert(XmlModel):
         xml_attribute=True,
     )
 
-    fingerprint: str = Field(
+    fingerprint: Optional[str] = Field(
         xml_attribute=True,
     )