diff --git a/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs b/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
index 56d5da981..ea0b24c5f 100644
--- a/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
+++ b/src/Covid19Radar.Api/Services/DeviceValidationAndroidService.cs
@@ -112,7 +112,8 @@ private AndroidAttestationStatement ParsePayload(string signedAttestationStateme
             catch (ArgumentException)
             {
                 // The token is not in a valid JWS format.
-                return null;
+                Logger.LogError("The token is not in a valid JWS format");
+                throw;
             }
 
             // We just want to validate the authenticity of the certificate.
@@ -135,7 +136,7 @@ private AndroidAttestationStatement ParsePayload(string signedAttestationStateme
             catch (ArgumentException)
             {
                 // Signature validation failed.
-                Logger.LogError("The token is not in a valid JWS format");
+                Logger.LogError("Signature validation failed");
                 throw;
             }