diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicy.java
index 2a03482..18d588c 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicy.java
@@ -88,10 +88,12 @@
 
 	//save configuration of the policy based on the policyname
 	private void saveConfigurations(String policyName, String jsonBody) {
+		
+		if(policyName.endsWith(".xml")){
+			policyName = policyName.replace(".xml", "");
+		}
+		
 		try (PrintWriter out = new PrintWriter(CONFIG_HOME + File.separator + policyName +".json");){
-			if(policyName.endsWith(".xml")){
-				policyName = policyName.replace(".xml", "");
-			}
 			out.println(jsonBody);
 		} catch (Exception e) {
 			LOGGER.error("Exception Occured While writing Configuration data"+e);