diff --git a/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java b/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java
index 9c19f5b80d..1eed205da6 100644
--- a/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java
+++ b/activemq-fileserver/src/main/java/org/apache/activemq/util/RestFilter.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  * read-permission-role and write-permission-role are defined then all requests
  * are authorized using the defined roles. Also GET methods are authorized.
  * </p>
- * 
+ *
  * @author Aleksi Kallio
  */
 public class RestFilter implements Filter {
@@ -179,8 +179,9 @@ public class RestFilter implements Filter {
             IOHelper.copyInputStream(request.getInputStream(), out);
         } catch (IOException e) {
             LOG.warn("Exception occured" , e);
-            out.close();
             throw e;
+        } finally {
+            out.close();
         }
 
         response.setStatus(HttpURLConnection.HTTP_NO_CONTENT); // we return no