diff --git a/src/core/index.js b/src/core/index.js
index 14c0637f..c34b91b6 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -3,11 +3,12 @@ import deepExtend from "deep-extend"
 import System from "core/system"
 import win from "core/window"
 import ApisPreset from "core/presets/apis"
+
 import * as AllPlugins from "core/plugins/all"
 import { parseSearch } from "core/utils"
 
-if (process.env.NODE_ENV !== "production") {
-  window.Perf = require("react-addons-perf")
+if (process.env.NODE_ENV !== "production" && typeof window !== "undefined") {
+  win.Perf = require("react-addons-perf")
 }
 
 // eslint-disable-next-line no-undef
diff --git a/src/core/utils.js b/src/core/utils.js
index 5f86f6d4..a809b343 100644
--- a/src/core/utils.js
+++ b/src/core/utils.js
@@ -607,7 +607,10 @@ export const getSampleSchema = (schema, contentType="", config={}) => {
 
 export const parseSearch = () => {
   let map = {}
-  let search = window.location.search
+  let search = win.location.search
+
+  if(!search)
+    return {}
 
   if ( search != "" ) {
     let params = search.substr(1).split("&")
diff --git a/src/polyfills.js b/src/polyfills.js
index a4ef6ea0..312d88dc 100644
--- a/src/polyfills.js
+++ b/src/polyfills.js
@@ -1,6 +1,6 @@
 // Promise global, Used ( at least ) by 'whatwg-fetch'. And required by IE 11
 
-if(!window.Promise) {
+if(typeof Promise === "undefined") {
   require("core-js/fn/promise")
 }