diff --git a/lib/jwt/jwk/key_finder.rb b/lib/jwt/jwk/key_finder.rb
index 55ecab7d..19f567da 100644
--- a/lib/jwt/jwk/key_finder.rb
+++ b/lib/jwt/jwk/key_finder.rb
@@ -14,10 +14,8 @@ def key_for(kid)
 
         jwk = resolve_key(kid)
 
-        unless jwk
-          raise ::JWT::DecodeError, 'No keys found in jwks' if jwks_keys.empty?
-          raise ::JWT::DecodeError, "Could not find public key for kid #{kid}"
-        end
+        raise ::JWT::DecodeError, 'No keys found in jwks' if jwks_keys.empty?
+        raise ::JWT::DecodeError, "Could not find public key for kid #{kid}" unless jwk
 
         ::JWT::JWK.import(jwk).keypair
       end