1 files changed, 6 insertions, 2 deletions
diff --git a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
index 0b66d37fb..b5c14a072 100644
--- a/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/YangUtils.java
@@ -94,9 +94,13 @@ public class YangUtils {
             final var jsonReader = new JsonReader(new StringReader(jsonData));
             jsonParserStream.parse(jsonReader);
 
-        } catch (final IOException | IllegalStateException | JsonSyntaxException exception) {
+        } catch (final IOException | JsonSyntaxException exception) {
             throw new DataValidationException(
-                    "Failed to parse json data: " + jsonData,  exception.getMessage(), exception);
+                "Failed to parse json data: " + jsonData, exception.getMessage(), exception);
+        } catch (final IllegalStateException illegalStateException) {
+            throw new DataValidationException(
+                "Failed to parse json data. Unsupported xpath or json data:" + jsonData, illegalStateException
+                .getMessage(), illegalStateException);
         }
         return normalizedNodeResult.getResult();
     }