--- a/Core/HttpServer/HttpFileSender.cpp	Mon Sep 01 12:20:26 2014 +0200
+++ b/Core/HttpServer/HttpFileSender.cpp	Tue Sep 02 15:51:20 2014 +0200
@@ -33,13 +33,25 @@
 #include "../PrecompiledHeaders.h"
 #include "HttpFileSender.h"
 
+#include "../OrthancException.h"
+
 #include <boost/lexical_cast.hpp>
 
 namespace Orthanc
 {
   void HttpFileSender::SendHeader(HttpOutput& output)
   {
-    output.SendOkHeader(contentType_.c_str(), true, GetFileSize(), downloadFilename_.c_str());
+    if (contentType_.size() > 0)
+    {
+      output.SetContentType(contentType_.c_str());
+    }
+
+    if (downloadFilename_.size() > 0)
+    {
+      output.SetContentFilename(downloadFilename_.c_str());
+    }
+
+    output.SetContentLength(GetFileSize());
   }
 
   void HttpFileSender::Send(HttpOutput& output)
@@ -48,7 +60,8 @@
 
     if (!SendData(output))
     {
-      output.SendHeader(HttpStatus_500_InternalServerError);
+      throw OrthancException(ErrorCode_InternalError);
+      //output.SendHeader(HttpStatus_500_InternalServerError);
     }
   }
 }