diff --git a/api/requirements.txt b/api/requirements.txt
index fe6b06a..7c78ce6 100644
--- a/api/requirements.txt
+++ b/api/requirements.txt
@@ -1,3 +1,4 @@
+click==6.7  # don't change the order, latest click lib has a critical bug
 requests==2.12.4  # don't change the order, latest requests lib has a critical bug
 Flask-SQLAlchemy>=2.3.2
 Flask-RESTful>=0.3.6
diff --git a/web/src/index/component/sidebar.js b/web/src/index/component/sidebar.js
index fa24ff9..f92d6e3 100755
--- a/web/src/index/component/sidebar.js
+++ b/web/src/index/component/sidebar.js
@@ -148,8 +148,11 @@ export default class Sidebar extends Component {
                         }
                     }
                     let firstDataName = list[0].name;
-                    let nextDataName = list[index + 1].name;
+                    let nextDataName = null;
                     let nextUrl = '';
+                    if (index < list.length - 1){
+                        nextDataName = list[index + 1].name;
+                    }
                     if (nextDataName) {
                         nextUrl = '/home/' + nextDataName;
                     }