diff --git a/data-prepper-plugins/opensearch-source/README.md b/data-prepper-plugins/opensearch-source/README.md
index 043c606d8d..4894ba646d 100644
--- a/data-prepper-plugins/opensearch-source/README.md
+++ b/data-prepper-plugins/opensearch-source/README.md
@@ -197,4 +197,3 @@ The default behavior is to process all indices.
#### Index Configuration
* `index_name_regex`: A regex pattern to represent the index names for filtering
-
diff --git a/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java b/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java
index d60c877f95..7fce6ecbe5 100644
--- a/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java
+++ b/data-prepper-plugins/parse-json-processor/src/test/java/org/opensearch/dataprepper/plugins/processor/parsejson/ParseJsonProcessorTest.java
@@ -306,6 +306,25 @@ void test_tags_when_json_parse_fails() {
assertTrue(parsedEvent.getMetadata().hasTags(testTags));
}
+ @Test
+ void when_evaluate_conditional_throws_RuntimeException_events_are_not_dropped() {
+ final String source = "different_source";
+ final String destination = "destination_key";
+ when(processorConfig.getSource()).thenReturn(source);
+ when(processorConfig.getDestination()).thenReturn(destination);
+ final String whenCondition = UUID.randomUUID().toString();
+ when(processorConfig.getParseWhen()).thenReturn(whenCondition);
+ final Map data = Collections.singletonMap("key", "value");
+ final String serializedMessage = convertMapToJSONString(data);
+ final Record testEvent = createMessageEvent(serializedMessage);
+ when(expressionEvaluator.evaluateConditional(whenCondition, testEvent.getData())).thenThrow(RuntimeException.class);
+ parseJsonProcessor = createObjectUnderTest();
+
+ final Event parsedEvent = createAndParseMessageEvent(testEvent);
+
+ assertThat(parsedEvent.toMap(), equalTo(testEvent.getData().toMap()));
+ }
+
private String constructDeeplyNestedJsonPointer(final int numberOfLayers) {
String pointer = "/" + DEEPLY_NESTED_KEY_NAME;
for (int layer = 0; layer < numberOfLayers; layer++) {