diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py
index f05a7638f4..8947d29032 100644
--- a/frappe/core/page/data_import_tool/importer.py
+++ b/frappe/core/page/data_import_tool/importer.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 import frappe, json
 import frappe.permissions
+import frappe.async
 
 from frappe import _
 
@@ -14,7 +15,7 @@ from frappe.utils.dateutils import parse_date
 from frappe.utils import cint, cstr, flt
 from  frappe.core.page.data_import_tool.data_import_tool import get_data_keys
 
-@frappe.whitelist()
+@frappe.async.handler
 def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, overwrite=None,
 	ignore_links=False, pre_process=None):
 	"""upload data"""
diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js
index 9022164c54..a2273fdfcf 100644
--- a/frappe/public/js/frappe/socket.js
+++ b/frappe/public/js/frappe/socket.js
@@ -85,13 +85,13 @@ frappe.socket = {
     }
     if(data) {
       var opts = frappe.socket.open_tasks[data.task_id];
-      if(opts[method]) opts[method](data.message);
+      if(opts[method]) opts[method](data);
     }
     if(opts.always) {
-      opts.always(data.message);
+      opts.always(data);
     }
     if(data.status_code && status_code > 400 && opts.error) {
-      opts.error(data.message);
+      opts.error(data);
       return;
     }