diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
index 11a82d4ca809ad8d8e337454b79f4cbee3c5bd6c..13ad6b13092bbb1382256db20c95fc151cf85474 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/RecoveryCertificateContainer.kt
@@ -22,7 +22,7 @@ data class RecoveryCertificateContainer(
 
     @delegate:Transient
     private val certificateData: DccData<RecoveryDccV1> by lazy {
-        data.recoveryCertificateQrCode!!.let {
+        data.recoveryCertificateQrCode.let {
             (
                 qrCodeExtractor.extract(
                     it,
@@ -94,7 +94,7 @@ data class RecoveryCertificateContainer(
                 get() = header.expiresAt
 
             override val qrCode: QrCodeString
-                get() = data.recoveryCertificateQrCode!!
+                get() = data.recoveryCertificateQrCode
         }
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
index f4f3dddf2ac4d988ea7c5a6d2ca855c23d517874..32a94f99b3a888adf7a08ca0437c4a4be4436227 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/recovery/core/storage/StoredRecoveryCertificateData.kt
@@ -3,9 +3,9 @@ package de.rki.coronawarnapp.covidcertificate.recovery.core.storage
 import com.google.gson.annotations.SerializedName
 
 data class StoredRecoveryCertificateData(
-    @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String?,
+    @SerializedName("recoveryCertificateQrCode") override val recoveryCertificateQrCode: String,
 ) : StoredRecoveryCertificate
 
 interface StoredRecoveryCertificate {
-    val recoveryCertificateQrCode: String?
+    val recoveryCertificateQrCode: String
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
index b974fca3ad83c476e7846d2edf90f75c7e6504d6..be939b8ef9480b3101cb48aeb699d63296f378c0 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/storage/types/BaseTestCertificateData.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.covidcertificate.test.core.storage.types
 import org.joda.time.Instant
 
 /**
- * Common data for test certificates, idepdent of whether they were retrieved or scanned.
+ * Common data for test certificates, independent of whether they were retrieved or scanned.
  */
 sealed class BaseTestCertificateData {
     abstract val identifier: String