diff --git a/apidGatewayDeploy_suite_test.go b/apidGatewayDeploy_suite_test.go
index d43c35f..33d3cf3 100644
--- a/apidGatewayDeploy_suite_test.go
+++ b/apidGatewayDeploy_suite_test.go
@@ -60,18 +60,6 @@
 		}
 		w.Write([]byte("/bundles/" + vars["id"]))
 	})
-	router.HandleFunc("/bundles/{id}", func(w http.ResponseWriter, req *http.Request) {
-		count++
-		vars := apid.API().Vars(req)
-		if count % 2 == 0 {
-			w.WriteHeader(500)
-			return
-		}
-		if vars["id"] == "longfail" {
-			time.Sleep(bundleDownloadTimeout + (250 * time.Millisecond))
-		}
-		w.Write([]byte("/bundles/" + vars["id"]))
-	})
 	testServer = httptest.NewServer(router)
 })
 
diff --git a/bundle.go b/bundle.go
index cdba445..4616476 100644
--- a/bundle.go
+++ b/bundle.go
@@ -56,12 +56,18 @@
 	go func() {
 		<- timeout.C
 		log.Debugf("bundle download timeout. marking deployment %s failed. will keep retrying: %s", dep.ID, dep.BundleURI)
+		var errMessage string
+		if err != nil {
+			errMessage = fmt.Sprintf("bundle download failed: %s", err)
+		} else {
+			errMessage = "bundle download failed"
+		}
 		setDeploymentResults(apiDeploymentResults{
 			{
 				ID:        dep.ID,
 				Status:    RESPONSE_STATUS_FAIL,
 				ErrorCode: ERROR_CODE_TODO,
-				Message:   fmt.Sprintf("bundle download failed: %s", err),
+				Message:   errMessage,
 			},
 		})
 	}()