diff --git a/archetypes/database-mp/src/main/resources/src/main/java/__pkg__/PokemonResource.java.mustache b/archetypes/database-mp/src/main/resources/src/main/java/__pkg__/PokemonResource.java.mustache
index 5cca7e14238..d5df94f8a3b 100644
--- a/archetypes/database-mp/src/main/resources/src/main/java/__pkg__/PokemonResource.java.mustache
+++ b/archetypes/database-mp/src/main/resources/src/main/java/__pkg__/PokemonResource.java.mustache
@@ -47,11 +47,11 @@ public class PokemonResource {
     @Path("{id}")
     @Produces(MediaType.APPLICATION_JSON)
     public Pokemon getPokemonById(@PathParam("id") String id) {
-        try {
-            return entityManager.find(Pokemon.class, Integer.valueOf(id));
-        } catch (IllegalArgumentException e) {
+        Pokemon pokemon = entityManager.find(Pokemon.class, Integer.valueOf(id));
+        if (pokemon == null) {
             throw new NotFoundException("Unable to find pokemon with ID " + id);
         }
+        return pokemon;
     }
 
     @DELETE
diff --git a/archetypes/database-mp/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache b/archetypes/database-mp/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache
index fa4824bc993..53d99da5ab2 100644
--- a/archetypes/database-mp/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache
+++ b/archetypes/database-mp/src/main/resources/src/test/java/__pkg__/MainTest.java.mustache
@@ -79,6 +79,18 @@ class MainTest {
         assertThat(getPokemonCount(), is(6));
     }
 
+    @Test
+    void testHealthMetrics() {
+        Response response = client.target(getConnectionString("/health"))
+                .request()
+                .get();
+        assertThat(response.getStatus(), is(200));
+        response = client.target(getConnectionString("/metrics"))
+                .request()
+                .get();
+        assertThat(response.getStatus(), is(200));
+    }
+
     private int getPokemonCount() {
         JsonArray pokemons = client.target(getConnectionString("/pokemon"))
                 .request()