Merge "Added null check for httpResponse to prevent crash at throwing exception"

1 files changed, 6 insertions, 2 deletions

diff --git a/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java
index e1992d98ca..ba6a5911b7 100644
--- a/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java
+++ b/cloudify-client/src/main/java/org/onap/so/cloudify/connector/http/HttpClientConnector.java
@@ -232,8 +232,12 @@ public class HttpClientConnector implements CloudifyClientConnector {
         }
 
         // Get here on an error response (4XX-5XX)
-        throw new CloudifyResponseException(httpResponse.getStatusLine().getReasonPhrase(),
-                httpResponse.getStatusLine().getStatusCode(), httpClientResponse);
+        if (httpResponse != null) {
+            throw new CloudifyResponseException(httpResponse.getStatusLine().getReasonPhrase(),
+                    httpResponse.getStatusLine().getStatusCode(), httpClientResponse);
+        } else {
+            throw new CloudifyResponseException("Null httpResponse", 0, httpClientResponse);
+        }
     }
 
 }