2 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/onap/dcae/restapi/ServletConfig.java b/src/main/java/org/onap/dcae/restapi/ServletConfig.java
index 2ba8a28e..35616ac1 100644
--- a/src/main/java/org/onap/dcae/restapi/ServletConfig.java
+++ b/src/main/java/org/onap/dcae/restapi/ServletConfig.java
@@ -21,6 +21,7 @@
 
 package org.onap.dcae.restapi;
 
+import org.onap.dcae.ApplicationException;
 import org.onap.dcae.ApplicationSettings;
 import org.onap.dcae.common.SSLContextCreator;
 import org.slf4j.Logger;
@@ -100,7 +101,7 @@ public class ServletConfig implements WebServerFactoryCustomizer<ConfigurableSer
             return new String(readAllBytes(location));
         } catch (IOException e) {
             log.error("Could not read keystore password from: '" + location + "'.", e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 }
 \ No newline at end of file
diff --git a/src/main/java/org/onap/dcae/restapi/VesRestController.java b/src/main/java/org/onap/dcae/restapi/VesRestController.java
index 68aecce5..510031df 100644
--- a/src/main/java/org/onap/dcae/restapi/VesRestController.java
+++ b/src/main/java/org/onap/dcae/restapi/VesRestController.java
@@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.onap.dcae.ApplicationException;
 import org.onap.dcae.ApplicationSettings;
 import org.onap.dcae.common.VESLogger;
 import org.slf4j.Logger;
@@ -165,7 +166,7 @@ public class VesRestController {
             }
             return report.isSuccess();
         } catch (Exception e) {
-            throw new RuntimeException("Unable to validate against schema", e);
+            throw new ApplicationException("Unable to validate against schema", e);
         }
     }