diff --git a/HISTORY.md b/HISTORY.md
index 0b1beb5..62045e6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,7 @@
+1.1.1 / 2017-6-10
+==================
+* Fix script error when script request error, thanks to @wheatma
+
 1.1.0 / 2017-6-7
 ==================
 * Handle <script> error event, thanks to @michaelvial
diff --git a/build/fetch-jsonp.js b/build/fetch-jsonp.js
index bb95470..35bd445 100644
--- a/build/fetch-jsonp.js
+++ b/build/fetch-jsonp.js
@@ -23,8 +23,6 @@
     return 'jsonp_' + Date.now() + '_' + Math.ceil(Math.random() * 100000);
   }
 
-  // Known issue: Will throw 'Uncaught ReferenceError: callback_*** is not defined'
-  // error if request timeout
   function clearFunction(functionName) {
     // IE8 throws an exception when you try to delete a property on window
     // http://stackoverflow.com/a/1824228/751089
@@ -37,7 +35,9 @@
 
   function removeScript(scriptId) {
     var script = document.getElementById(scriptId);
-    document.getElementsByTagName('head')[0].removeChild(script);
+    if (script) {
+      document.getElementsByTagName('head')[0].removeChild(script);
+    }
   }
 
   function fetchJsonp(_url) {
@@ -79,12 +79,6 @@
         jsonpScript.setAttribute('charset', options.charset);
       }
       jsonpScript.id = scriptId;
-      jsonpScript.onerror = function () {
-        reject(new Error('JSONP request to ' + _url + ' failed'));
-
-        clearFunction(callbackFunction);
-        removeScript(scriptId);
-      };
       document.getElementsByTagName('head')[0].appendChild(jsonpScript);
 
       timeoutId = setTimeout(function () {
@@ -93,6 +87,15 @@
         clearFunction(callbackFunction);
         removeScript(scriptId);
       }, timeout);
+
+      // Caught if got 404/500
+      jsonpScript.onerror = function () {
+        reject(new Error('JSONP request to ' + _url + ' failed'));
+
+        clearFunction(callbackFunction);
+        removeScript(scriptId);
+        if (timeoutId) clearTimeout(timeoutId);
+      };
     });
   }
 
diff --git a/package.json b/package.json
index a4131e0..26d6c64 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "fetch-jsonp",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Fetch JSONP like a boss using Fetch API",
   "main": "build/fetch-jsonp.js",
   "scripts": {
+    "prepublish": "npm run lint && npm run clean && npm run build",
     "test": "mocha --compilers js:babel/register --recursive --ui bdd --reporter spec",
     "build": "babel src/ --modules umd --out-dir build",
     "clean": "rm -rf build",