diff --git a/framework/src/play/mvc/Scope.java b/framework/src/play/mvc/Scope.java
index 54c8774b..11abbbdb 100644
--- a/framework/src/play/mvc/Scope.java
+++ b/framework/src/play/mvc/Scope.java
@@ -50,6 +50,9 @@ public static class Flash {
     final Map<String, String> data;
     final Map<String, String> out = new HashMap<>();
 
+    private final String ERROR = "error";
+    private final String SUCCESS = "success";
+
     public Flash() {
       this(new HashMap<>(2));
     }
@@ -96,11 +99,27 @@ private void validateKey(@Nonnull String key) {
     }
 
     public void error(@Nonnull String value, Object... args) {
-      put("error", Messages.get(value, args));
+      put(ERROR, Messages.get(value, args));
+    }
+
+    public String getErrorMessage() {
+      return get(ERROR);
+    }
+
+    public boolean containsError() {
+      return contains(ERROR);
     }
 
     public void success(@Nonnull String value, Object... args) {
-      put("success", Messages.get(value, args));
+      put(SUCCESS, Messages.get(value, args));
+    }
+
+    public String getSuccessMessage() {
+      return get(SUCCESS);
+    }
+
+    public boolean containsSuccess() {
+      return contains(SUCCESS);
     }
 
     public void discard(@Nonnull String key) {
@@ -210,7 +229,7 @@ public void put(@Nonnull String key, @Nullable String value) {
     public void put(@Nonnull String key, @Nullable Object value) {
       change();
       if (value == null) {
-        put(key, (String) null);
+        put(key, null);
       } else {
         put(key, value.toString());
       }
@@ -292,10 +311,8 @@ public void checkAndParse() {
       __mergeWith(request.routeArgs);
 
       if (request.querystring != null) {
-        _mergeWith(
-            UrlEncodedParser.parseQueryString(
-                new ByteArrayInputStream(request.querystring.getBytes(request.encoding)),
-                request.encoding));
+        var inputStream = new ByteArrayInputStream(request.querystring.getBytes(request.encoding));
+        _mergeWith(UrlEncodedParser.parseQueryString(inputStream, request.encoding));
       }
       String contentType = request.contentType;
       if (contentType != null) {
@@ -310,21 +327,21 @@ public void checkAndParse() {
     public void put(@Nonnull String key, @Nullable String value) {
       checkAndParse();
       data.put(key, new String[] {value});
-      // make sure rootsParamsNode is regenerated if needed
+      // To ensure rootsParamsNode is regenerated if needed
       rootParamsNodeIsGenerated = false;
     }
 
     public void put(@Nonnull String key, @Nonnull String[] values) {
       checkAndParse();
       data.put(key, values);
-      // make sure rootsParamsNode is regenerated if needed
+      // To ensure rootsParamsNode is regenerated if needed
       rootParamsNodeIsGenerated = false;
     }
 
     public void remove(@Nonnull String key) {
       checkAndParse();
       data.remove(key);
-      // make sure rootsParamsNode is regenerated if needed
+      // To ensure rootsParamsNode is regenerated if needed
       rootParamsNodeIsGenerated = false;
     }
 
@@ -447,7 +464,7 @@ public Object get(@Nonnull String key) {
 
     @Nullable
     @SuppressWarnings("unchecked")
-    public <T> T get(String key, Class<T> clazz) {
+    public <T> T get(String key, @SuppressWarnings("unused") Class<T> clazz) {
       return (T) this.get(key);
     }