diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index 9d70f9f5..cae9bcab 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -9,7 +9,7 @@ import { TRANSITION, FONT_WEIGHT, FONT_SIZE } from 'config/variables';
 type Props = {
     children: React.Node,
     className?: string,
-    onClick: () => any,
+    onClick?: () => any,
     onMouseEnter?: () => void,
     onMouseLeave?: () => void,
     onFocus?: () => void,
diff --git a/src/store.js b/src/store.js
index f5e985d6..39600b1a 100644
--- a/src/store.js
+++ b/src/store.js
@@ -46,9 +46,8 @@ if (process.env.NODE_ENV === 'development') {
         collapsed: true,
     });
 
-    const { devToolsExtension }: ?Function = window;
-    if (typeof devToolsExtension === 'function') {
-        enhancers.push(devToolsExtension());
+    if (window && typeof window.devToolsExtension === 'function') {
+        enhancers.push(window.devToolsExtension());
     }
 
     composedEnhancers = compose(
@@ -67,9 +66,3 @@ export default createStore(
     initialState,
     composedEnhancers,
 );
-
-// if (process.env.NODE_ENV === 'production') {
-//     module.exports = require('./store.dev'); // eslint-disable-line global-require
-// } else {
-//     module.exports = require('./store.dev'); // eslint-disable-line global-require
-// }
\ No newline at end of file