diff --git a/src/api.js b/src/api.js
index b24867222..7429c4779 100644
--- a/src/api.js
+++ b/src/api.js
@@ -572,7 +572,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
       }, this);
 
       messageHandler.on('DocError', function transportDocError(data) {
-        this.workerReadyPromise.reject(data.message);
+        this.workerReadyPromise.reject(data);
       }, this);
 
       messageHandler.on('PageError', function transportError(data) {
diff --git a/test/driver.js b/test/driver.js
index a2d469f3d..6ea1fc531 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -86,10 +86,6 @@ function exceptionToString(e) {
   return e.message + ('stack' in e ? ' at ' + e.stack.split('\n')[0] : '');
 }
 
-function expandUrl(url) {
-  return combineUrl(window.location.href, url);
-}
-
 function nextTask() {
   cleanup();
 
@@ -102,7 +98,8 @@ function nextTask() {
 
   log('Loading file "' + task.file + '"\n');
 
-  getPdf(expandUrl(task.file), function nextTaskGetPdf(data) {
+  var absoluteUrl = combineUrl(window.location.href, task.file);
+  getPdf(absoluteUrl, function nextTaskGetPdf(data) {
     var failure;
     function continuation() {
       task.pageNum = task.firstPage || 1;
diff --git a/web/viewer.js b/web/viewer.js
index ab1bf711d..c296c10c7 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -33,10 +33,6 @@ function getFileName(url) {
   return url.substring(url.lastIndexOf('/', end) + 1, end);
 }
 
-function expandUrl(url) {
-  return PDFJS.combineUrl(window.location.href, url);
-}
-
 var Cache = function cacheCache(size) {
   var data = [];
   this.push = function cachePush(view) {
@@ -388,7 +384,7 @@ var PDFView = {
     if (typeof url === 'string') { // URL
       this.url = url;
       document.title = decodeURIComponent(getFileName(url)) || url;
-      parameters.url = expandUrl(url);
+      parameters.url = PDFJS.combineUrl(window.location.href, url);
     } else if (url && 'byteLength' in url) { // ArrayBuffer
       parameters.data = url;
     }