diff --git a/css.js b/css.js
index d30bf98..2d0f346 100644
--- a/css.js
+++ b/css.js
@@ -146,21 +146,23 @@ define(function() {
         }
       }, 10);
     link.href = url;
+    // Support for requireJS error handling on links. Tested Chrome v44 & Firefox v40
+    link.onerror=function(error){
+      this.remove();
+      callback.error(error);
+    }
     head.appendChild(link);
   }
 
 //>>excludeEnd('excludeRequireCss')
   cssAPI.normalize = function(name, normalize) {
-    if (name.substr(name.length - 4, 4) == '.css')
-      name = name.substr(0, name.length - 4);
-
-    return normalize(name);
+    // Only append .css if it doesn't have it already or a ?
+    return normalize( /(\?|\.css$)/.test(name) ? name : name+'.css' );
   }
 
 //>>excludeStart('excludeRequireCss', pragmas.excludeRequireCss)
   cssAPI.load = function(cssId, req, load, config) {
-
-    (useImportLoad ? importLoad : linkLoad)(req.toUrl(cssId + '.css'), load);
+    (useImportLoad ? importLoad : linkLoad)(req.toUrl(cssId), load);
 
   }
 
diff --git a/css.min.js b/css.min.js
index 2e1d120..923c99b 100644
--- a/css.min.js
+++ b/css.min.js
@@ -1 +1 @@
-define(function(){if("undefined"==typeof window)return{load:function(e,t,n){n()}};var e=document.getElementsByTagName("head")[0],t=window.navigator.userAgent.match(/Trident\/([^ ;]*)|AppleWebKit\/([^ ;]*)|Opera\/([^ ;]*)|rv\:([^ ;]*)(.*?)Gecko\/([^ ;]*)|MSIE\s([^ ;]*)|AndroidWebKit\/([^ ;]*)/)||0,n=!1,r=!0;t[1]||t[7]?n=parseInt(t[1])<6||parseInt(t[7])<=9:t[2]||t[8]?r=!1:t[4]&&(n=parseInt(t[4])<18);var o={};o.pluginBuilder="./css-builder";var a,i,s,l=function(){a=document.createElement("style"),e.appendChild(a),i=a.styleSheet||a.sheet},u=0,d=[],c=function(e){u++,32==u&&(l(),u=0),i.addImport(e),a.onload=function(){f()}},f=function(){s();var e=d.shift();return e?(s=e[1],void c(e[0])):void(s=null)},h=function(e,t){if(i&&i.addImport||l(),i&&i.addImport)s?d.push([e,t]):(c(e),s=t);else{a.textContent='@import "'+e+'";';var n=setInterval(function(){try{a.sheet.cssRules,clearInterval(n),t()}catch(e){}},10)}},p=function(t,n){var o=document.createElement("link");if(o.type="text/css",o.rel="stylesheet",r)o.onload=function(){o.onload=function(){},setTimeout(n,7)};else var a=setInterval(function(){for(var e=0;e<document.styleSheets.length;e++){var t=document.styleSheets[e];if(t.href==o.href)return clearInterval(a),n()}},10);o.href=t,e.appendChild(o)};return o.normalize=function(e,t){return".css"==e.substr(e.length-4,4)&&(e=e.substr(0,e.length-4)),t(e)},o.load=function(e,t,r){(n?h:p)(t.toUrl(e+".css"),r)},o});
\ No newline at end of file
+define(function(){if(typeof window=="undefined")return{load:function(e,t,n){n()}};var e=document.getElementsByTagName("head")[0];var t=window.navigator.userAgent.match(/Trident\/([^ ;]*)|AppleWebKit\/([^ ;]*)|Opera\/([^ ;]*)|rv\:([^ ;]*)(.*?)Gecko\/([^ ;]*)|MSIE\s([^ ;]*)|AndroidWebKit\/([^ ;]*)/)||0;var n=false;var r=true;if(t[1]||t[7])n=parseInt(t[1])<6||parseInt(t[7])<=9;else if(t[2]||t[8])r=false;else if(t[4])n=parseInt(t[4])<18;var a={};a.pluginBuilder="./css-builder";var o,i;var s=function(){o=document.createElement("style");e.appendChild(o);i=o.styleSheet||o.sheet};var l=0;var f=[];var u;var c=function(e){i.addImport(e);o.onload=function(){d()};l++;if(l==31){s();l=0}};var d=function(){u();var e=f.shift();if(!e){u=null;return}u=e[1];c(e[0])};var v=function(e,t){if(!i||!i.addImport)s();if(i&&i.addImport){if(u){f.push([e,t])}else{c(e);u=t}}else{o.textContent='@import "'+e+'";';var n=setInterval(function(){try{o.sheet.cssRules;clearInterval(n);t()}catch(e){}},10)}};var h=function(t,n){var a=document.createElement("link");a.type="text/css";a.rel="stylesheet";if(r)a.onload=function(){a.onload=function(){};setTimeout(n,7)};else var o=setInterval(function(){for(var e=0;e<document.styleSheets.length;e++){var t=document.styleSheets[e];if(t.href==a.href){clearInterval(o);return n()}}},10);a.href=t;a.onerror=function(e){this.remove();n.error(e)};e.appendChild(a)};a.normalize=function(e,t){return t(/(\?|\.css$)/.test(e)?e:e+".css")};a.load=function(e,t,r,a){(n?v:h)(t.toUrl(e),r)};return a});