diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 768e3bbf2c..25951c5078 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -44,36 +44,37 @@ frappe.request.call = function(opts) {
 	// all requests will be post, set _type as POST for commit
 	opts.args._type = opts.type;
 
+	var statusCode = {
+		200: function(data, xhr) {
+			if(typeof data === "string") data = JSON.parse(data);
+			opts.success_callback && opts.success_callback(data, xhr.responseText);
+		},
+		404: function(xhr) {
+			msgprint(__("Not found"));
+		},
+		403: function(xhr) {
+			msgprint(__("Not permitted"));
+		},
+		417: function(data, xhr) {
+			if(typeof data === "string") data = JSON.parse(data);
+			opts.error_callback && opts.error_callback(data, xhr.responseText);
+		},
+		501: function(data, xhr) {
+			if(typeof data === "string") data = JSON.parse(data);
+			opts.error_callback && opts.error_callback(data, xhr.responseText);
+		},
+		500: function(xhr) {
+			msgprint(__("Server Error: Please check your server logs or contact tech support."))
+			opts.error_callback && opts.error_callback();
+			frappe.request.report_error(xhr, opts);
+		}
+	};
+
 	var ajax_args = {
 		url: opts.url || frappe.request.url,
 		data: opts.args,
 		type: 'POST',
 		dataType: opts.dataType || 'json',
-		statusCode: {
-			200: function(data, xhr) {
-				if(typeof data === "string") data = JSON.parse(data);
-				opts.success && opts.success(data, xhr.responseText);
-			},
-			404: function(xhr) {
-				msgprint(__("Not found"));
-			},
-			403: function(xhr) {
-				msgprint(__("Not permitted"));
-			},
-			417: function(data, xhr) {
-				if(typeof data === "string") data = JSON.parse(data);
-				opts.error && opts.error(data, xhr.responseText);
-			},
-			501: function(data, xhr) {
-				if(typeof data === "string") data = JSON.parse(data);
-				opts.error && opts.error(data, xhr.responseText);
-			},
-			500: function(xhr) {
-				msgprint(__("Server Error: Please check your server logs or contact tech support."))
-				opts.error && opts.error();
-				frappe.request.report_error(xhr, opts);
-			}
-		},
 		async: opts.async
 	};
 
@@ -104,18 +105,31 @@ frappe.request.call = function(opts) {
 	}
 
 	return $.ajax(ajax_args)
-	.fail(function(xhr, textStatus) {
-		opts.error && opts.error(xhr)
-	})
-	.always(function(data) {
-		if(typeof data==="string") {
-			data = JSON.parse(data);
-		}
-		if(data.responseText) {
-			data = JSON.parse(data.responseText);
-		}
-		frappe.request.cleanup(opts, data);
-	});
+		.always(function(data, textStatus, xhr) {
+			if(typeof data==="string") {
+				data = JSON.parse(data);
+			}
+			if(data.responseText) {
+				var xhr = data;
+				data = JSON.parse(data.responseText);
+			}
+			frappe.request.cleanup(opts, data);
+		})
+		.done(function(data, textStatus, xhr) {
+			var status_code_handler = statusCode[xhr.statusCode().status];
+			if (status_code_handler) {
+				status_code_handler(data, xhr);
+			}
+		})
+		.fail(function(xhr, textStatus) {
+			var status_code_handler = statusCode[xhr.statusCode().status];
+			if (status_code_handler) {
+				status_code_handler(xhr);
+			} else {
+				// if not handled by error handler!
+				opts.error_callback && opts.error_callback(xhr);
+			}
+		});
 }
 
 // call execute serverside request
@@ -142,6 +156,11 @@ frappe.request.prepare = function(opts) {
 		throw "Incomplete Request";
 	}
 
+	opts.success_callback = opts.success;
+	opts.error_callback = opts.error;
+	delete opts.success;
+	delete opts.error;
+
 }
 
 frappe.request.cleanup = function(opts, r) {
@@ -204,7 +223,7 @@ frappe.request.cleanup = function(opts, r) {
 	}
 
 	if(r.docs || r.docinfo) {
-		r.docs = frappe.model.sync(r);
+		frappe.model.sync(r);
 	}
 	if(r.__messages) {
 		$.extend(frappe._messages, r.__messages);
diff --git a/frappe/public/js/frappe/views/query_report.js b/frappe/public/js/frappe/views/query_report.js
index c6f0b8feee..47595440cd 100644
--- a/frappe/public/js/frappe/views/query_report.js
+++ b/frappe/public/js/frappe/views/query_report.js
@@ -91,13 +91,13 @@ frappe.views.QueryReport = Class.extend({
 				this.wrapper.find(".no-report-area").toggle(false);
 				me.appframe.set_title(__("Query Report")+": " + __(me.report_name));
 
-				me.appframe.set_title_left(function() {
-					frappe.set_route(frappe.get_module(me.report_doc.module).link); });
-
-
 				frappe.model.with_doc("Report", me.report_name, function() {
+
 					me.report_doc = frappe.get_doc("Report", me.report_name);
 
+					me.appframe.set_title_left(function() {
+						frappe.set_route(frappe.get_module(me.report_doc.module).link); });
+
 					frappe.model.with_doctype(me.report_doc.ref_doctype, function() {
 						if(!frappe.query_reports[me.report_name]) {
 							return frappe.call({