1 files changed, 10 insertions, 4 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
index 8548ffe8..e09322d3 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
@@ -55,16 +55,22 @@ public class AaiHttpClientConfig {
     public AaiHttpClient<AaiServiceInstanceQueryModel, AaiServiceInstanceResultModel> getServiceInstanceClient() {
         return createLazyConfigClient(
                 (config, client) -> new AaiGetServiceInstanceClient(config, client)
-                        .map(httpResponse -> httpResponse.bodyAsJson(StandardCharsets.UTF_8,
-                                PrhModelAwareGsonBuilder.createGson(), AaiServiceInstanceResultModel.class)));
+                        .map(httpResponse -> {
+                            httpResponse.throwIfUnsuccessful();
+                            return httpResponse.bodyAsJson(StandardCharsets.UTF_8,
+                                    PrhModelAwareGsonBuilder.createGson(), AaiServiceInstanceResultModel.class);
+                        }));
     }
 
     @Bean
     public AaiHttpClient<AaiModel, AaiPnfResultModel> getGetClient() {
         return createLazyConfigClient(
                 (config, client) -> new AaiHttpGetClient(config, client)
-                        .map(httpResponse -> httpResponse.bodyAsJson(StandardCharsets.UTF_8,
-                                PrhModelAwareGsonBuilder.createGson(), AaiPnfResultModel.class)));
+                        .map(httpResponse -> {
+                            httpResponse.throwIfUnsuccessful();
+                            return httpResponse.bodyAsJson(StandardCharsets.UTF_8,
+                                    PrhModelAwareGsonBuilder.createGson(), AaiPnfResultModel.class);
+                        }));
     }
 
     private <T, U> AaiHttpClient<T, U> createLazyConfigClient(