diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt
index 2644430f991c08a461a511c33622c0f3eee647c6..3d56617f2538049c89716141f31c90fefebe1c19 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/update/UpdateChecker.kt
@@ -14,6 +14,7 @@ import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.UpdateAvailability
 import de.rki.coronawarnapp.BuildConfig
 import de.rki.coronawarnapp.R
+import de.rki.coronawarnapp.exception.CwaSecurityException
 import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass
 import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
 import de.rki.coronawarnapp.ui.LauncherActivity
@@ -31,12 +32,13 @@ class UpdateChecker(private val activity: LauncherActivity) {
     suspend fun checkForUpdate() {
 
         // check if an update is needed based on server config
-        // TODO replace with signature exception
         val updateNeededFromServer: Boolean = try {
             checkIfUpdatesNeededFromServer()
+        } catch (exception: CwaSecurityException) {
+            Log.e(TAG, "CwaSecurityException caught:" + exception.localizedMessage)
+            true
         } catch (exception: Exception) {
-            Log.e(TAG, exception.localizedMessage ?: "unknown error")
-            exception.printStackTrace()
+            Log.e(TAG, "Exception caught:" + exception.localizedMessage)
             false
         }