diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
index 86f1771770..dae760b44a 100644
--- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
+++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java
@@ -158,7 +158,7 @@ public class StatViewServlet extends HttpServlet {
             content.append("<td class='td_lable'>Relationships</td>");
             content.append("<td>" + visitor.getRelationships() + "</td>");
             content.append("</tr>");
-            
+
             content.append("<tr>");
             content.append("<td class='td_lable'>OrderByColumns</td>");
             content.append("<td>" + visitor.getOrderByColumns() + "</td>");
@@ -304,11 +304,13 @@ public class StatViewServlet extends HttpServlet {
 
         json.put("PoolingCount", dataSource.getPoolingCount());
         json.put("PoolingPeak", dataSource.getPoolingPeak());
-        json.put("PoolingPeakTime", dataSource.getPoolingPeakTime());
+        json.put("PoolingPeakTime",
+                 dataSource.getPoolingPeakTime() == null ? null : dataSource.getPoolingPeakTime().toString());
 
         json.put("ActiveCount", dataSource.getActiveCount());
         json.put("ActivePeak", dataSource.getActivePeak());
-        json.put("ActivePeakTime", dataSource.getActivePeakTime());
+        json.put("ActivePeakTime",
+                 dataSource.getActivePeakTime() == null ? null : dataSource.getActivePeakTime().toString());
 
         json.put("InitialSize", dataSource.getInitialSize());
         json.put("MinIdle", dataSource.getMinIdle());
diff --git a/src/main/resources/support/http/resources/js.js b/src/main/resources/support/http/resources/js.js
index 62a33f0da5..8925501c4d 100644
--- a/src/main/resources/support/http/resources/js.js
+++ b/src/main/resources/support/http/resources/js.js
@@ -74,7 +74,7 @@ function ajaxResponseForBasicInfo() {
 }
 function changeInnerHtml(id, divHtml) {
 	var divObj = document.getElementById(id);
-	if(!divHtml)
+	if(divHtml==undefined)
 		divHtml='';
 	if (divObj) {
 		divObj.innerHTML = divHtml;
@@ -141,7 +141,7 @@ function ajaxResponseForDataSourceInfo() {
 						listHtml += '<tr><td class="td_lable">URL</td><td id="DS-Info-URL' + datasourceId + '">&nbsp;</td><td>数据源的JdbcURL</td></tr>';
 						listHtml += '<tr><td class="td_lable">DbType</td><td id="DS-Info-DbType' + datasourceId + '">&nbsp;</td><td>数据库类型</td></tr>';
 						listHtml += '<tr><td class="td_lable">DriverClassName</td><td id="DS-Info-DriverClassName' + datasourceId + '">&nbsp;</td><td>Jdbc驱动的名称</td></tr>';
-						listHtml += '<tr><td class="td_lable">FilterClassNames</td><td id="DS-Info-DriverClassName' + datasourceId + '">&nbsp;</td><td>启用的filter的名称</td></tr>';
+						listHtml += '<tr><td class="td_lable">FilterClassNames</td><td id="DS-Info-FilterClassNames' + datasourceId + '">&nbsp;</td><td>启用的filter的名称</td></tr>';
 						
 						listHtml += '<tr><td class="td_lable">TestOnBorrow</td><td id="DS-Info-TestOnBorrow' + datasourceId + '">&nbsp;</td><td>借出连接时是否做测试</td></tr>';
 						listHtml += '<tr><td class="td_lable">TestWhileIdle</td><td id="DS-Info-TestWhileIdle' + datasourceId + '">&nbsp;</td><td>归还连接时是否做测试</td></tr>';