diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
index b1a604f9b0..7d42703b2e 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
@@ -55,7 +55,9 @@ public class PutSNS extends AbstractSNSProcessor {
             .build();
     public static final PropertyDescriptor USE_JSON_STRUCTURE = new PropertyDescriptor.Builder()
             .name("Use JSON Structure")
-            .description("If true, the contents of the FlowFile must be JSON with a top-level element named 'default'. Additional elements can be used to send different messages to different protocols. See the Amazon SNS Documentation for more information.")
+            .description("If true, the contents of the FlowFile must be JSON with a top-level element named 'default'."
+                    + " Additional elements can be used to send different messages to different protocols. See the Amazon"
+                    + " SNS Documentation for more information.")
             .defaultValue("false")
             .allowableValues("true", "false")
             .required(true)
@@ -147,7 +149,6 @@ public class PutSNS extends AbstractSNSProcessor {
         } catch (final Exception e) {
             getLogger().error("Failed to publish Amazon SNS message for {} due to {}", new Object[]{flowFile, e});
             session.transfer(flowFile, REL_FAILURE);
-            return;
         }
     }
 
diff --git a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java
index 929a43783d..7c2dd2d3fa 100644
--- a/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java
+++ b/nifi/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sqs/GetSQS.java
@@ -195,7 +195,8 @@ public class GetSQS extends AbstractSQSProcessor {
             try {
                 client.deleteMessageBatch(deleteRequest);
             } catch (final Exception e) {
-                getLogger().error("Received {} messages from Amazon SQS but failed to delete the messages; these messages may be duplicated. Reason for deletion failure: {}", new Object[]{messages.size(), e});
+                getLogger().error("Received {} messages from Amazon SQS but failed to delete the messages; these messages"
+                        + " may be duplicated. Reason for deletion failure: {}", new Object[]{messages.size(), e});
             }
         }