vaadin
diff --git a/‎flow-server/src/main/java/com/vaadin/flow/server/streams/DownloadResponse.java
Lines changed: 76 additions & 1 deletion b/‎flow-server/src/main/java/com/vaadin/flow/server/streams/DownloadResponse.java
Lines changed: 76 additions & 1 deletion
@@ -24,6 +24,9 @@
 /**
  * Data class containing required information for sending the given input stream
  * to the client.
+ * <p>
+ * The given input stream will be read at a later time and will be automatically
+ * closed by the caller.
  *
  * @since 24.8
  */
@@ -36,12 +39,14 @@ public class DownloadResponse implements Serializable {
     private final int size;
 
     private Integer error;
+    private String errorMessage;
 
     /**
      * Create a download response with content stream and content data.
      *
      * @param inputStream
-     *            data stream for data to send to client
+     *            data stream for data to send to client, stream will be closed
+     *            automatically after use by the caller.
      * @param fileName
      *            file name of download
      * @param contentType
@@ -59,6 +64,8 @@ public DownloadResponse(InputStream inputStream, String fileName,
 
     /**
      * Get the InputStream to read the content data from.
+     * <p>
+     * InputStream needs to be closed by the called after reading is over.
      *
      * @return content InputStream
      */
@@ -107,6 +114,22 @@ public static DownloadResponse error(int statusCode) {
         return downloadResponse;
     }
 
+    /**
+     * Generate an error response for download with message.
+     *
+     * @param statusCode
+     *            error status code
+     * @param message
+     *            error message for details on what went wrong
+     * @return DownloadResponse for request
+     */
+    public static DownloadResponse error(int statusCode, String message) {
+        DownloadResponse downloadResponse = new DownloadResponse(null, null,
+                null, -1);
+        downloadResponse.setError(statusCode, message);
+        return downloadResponse;
+    }
+
     /**
      * Generate an error response for download.
      *
@@ -121,6 +144,23 @@ public static DownloadResponse error(HttpStatusCode statusCode) {
         return downloadResponse;
     }
 
+    /**
+     * Generate an error response for download with message.
+     *
+     * @param statusCode
+     *            error status code
+     * @param message
+     *            error message for details on what went wrong
+     * @return DownloadResponse for request
+     */
+    public static DownloadResponse error(HttpStatusCode statusCode,
+            String message) {
+        DownloadResponse downloadResponse = new DownloadResponse(null, null,
+                null, -1);
+        downloadResponse.setError(statusCode, message);
+        return downloadResponse;
+    }
+
     /**
      * Check if response has an error code.
      *
@@ -140,6 +180,19 @@ public void setError(int error) {
         this.error = error;
     }
 
+    /**
+     * Set http error code and error message.
+     *
+     * @param error
+     *            error code
+     * @param errorMessage
+     *            error message
+     */
+    public<
8000
/span> void setError(int error, String errorMessage) {
+        this.error = error;
+        this.errorMessage = errorMessage;
+    }
+
     /**
      * Set http error code.
      *
@@ -150,6 +203,19 @@ public void setError(HttpStatusCode error) {
         this.error = error.getCode();
     }
 
+    /**
+     * Set http error code and error message.
+     *
+     * @param error
+     *            error code
+     * @param errorMessage
+     *            error message
+     */
+    public void setError(HttpStatusCode error, String errorMessage) {
+        this.error = error.getCode();
+        this.errorMessage = errorMessage;
+    }
+
     /**
      * Get the set error code.
      *
@@ -161,4 +227,13 @@ public int getError() {
         }
         return error;
     }
+
+    /**
+     * Get error message if set for error response.
+     *
+     * @return error message or null if not set
+     */
+    public String getErrorMessage() {
+        return errorMessage;
+    }
 }