1 files changed, 6 insertions, 3 deletions

diff --git a/node_modules/montage/ui/template.js b/node_modules/montage/ui/template.js
index ee2cc1be..6dbf2c67 100755
--- a/node_modules/montage/ui/template.js
+++ b/node_modules/montage/ui/template.js
@@ -167,7 +167,7 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
 
         this.createHtmlDocumentFromModuleId(requireFunction, moduleId, function(doc) {
             if (!doc) {
-                throw "Template '" + url + "' not found.";
+                throw "Template '" + moduleId + "' not found.";
             }
             self._isLoaded = true;
             self.initWithDocument(doc);
@@ -602,7 +602,8 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
         for (var i = 0, cssTag; (cssTag = cssTags[i]); i++) {
             if ((url = cssTag.getAttribute("href"))) {
                 if (! /^https?:\/\/|^\//.test(url)) { // TODO: look into base links...
-                    url = rootUrl + url;
+                    cssTag.href = rootUrl + url;
+                    url = cssTag.href;
                 }
 
                 if (url in fromLinks) {
@@ -711,7 +712,9 @@ var Template = exports.Template = Montage.create(Montage, /** @lends module:mont
             scriptNode = doc.importNode(script, true);
             if (src) {
                 if (! /^https?:\/\/|^\//.test(src)) { // TODO: look into base links...
-                    scriptNode.src = src = rootUrl + src;
+                    scriptNode.src = rootUrl + src;
+                    // scriptNode.src = scriptNode.src is used to normalize the src attribute
+                    src = (scriptNode.src = scriptNode.src);
                 }
                 if (src in externalScriptsLoaded) continue;
                 externalScriptsLoaded[src] = true;