diff --git a/api.coffee b/api.coffee
index 21c58e7..e0a3e7c 100644
--- a/api.coffee
+++ b/api.coffee
@@ -241,15 +241,18 @@ else
         filename = querystring.unescape(FILES_REGEX.exec(urlParts.pathname)[1])
         if request.method == 'PUT'
           metadata = {
-            SoftwareVersion : request.headers.softwareversion,
-            HardwareVersion : request.headers.hardwareversion,
+            FileType : request.headers.filetype,
             Manufacturer : request.headers.manufacturer,
+            ProductClass : request.headers.productclass,
+            SoftwareVersion : request.headers.softwareversion,
           }
 
           gs = new mongodb.GridStore(db.mongoDb, filename, 'w', {metadata : metadata})
           gs.open((err, gs) ->
             gs.write(request.getBody('binary'), (err, res) ->
+              throw err if err
               gs.close((err) ->
+                throw err if err
               )
               response.writeHead(201)
               response.end()
diff --git a/tasks.coffee b/tasks.coffee
index cd938dd..4e87091 100644
--- a/tasks.coffee
+++ b/tasks.coffee
@@ -358,7 +358,7 @@ this.download = (task, methodResponse, callback) ->
 
       methodRequest = {
         type : 'Download',
-        fileType : '1 Firmware Upgrade Image',
+        fileType : file.metadata?.FileType ? '1 Firmware Upgrade Image',
         fileSize : file.length,
         url : "http://#{config.FILES_IP}:#{config.FILES_PORT}/#{file.filename}"
       }