1 files changed, 4 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
index c772d308..0d416ae2 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
@@ -927,8 +927,10 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject {
 			throw new ReportSQLException (ex.getMessage(), ex.getCause());
 		} finally {
 			   try {	
-					stmt.close();
-					connection.close();
+				    if(stmt!=null)
+				    	stmt.close();
+				    if(connection!=null)
+				    	connection.close();
 					DbUtils.clearConnection(connection);
 				   } catch (SQLException ex) {
 						throw new ReportSQLException (ex.getMessage(), ex.getCause());