diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index 7b7649b..dd93dbb 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -193,7 +193,7 @@
                 opens: 'left'
             }, function (start, end, label) {
             });
-
+            
             $('#date-range-history').on('apply.daterangepicker', function (ev, picker) {
                 $(this).val(picker.startDate.format('YYYY-MM-DD') + ' ~ ' + picker.endDate.format('YYYY-MM-DD'));
                 $(this).trigger('change');
@@ -211,8 +211,10 @@
             var today_format = today.toISOString().slice(0, 10).replace(/-/g, "/");
             //var dateLimit_format = dateLimit.toISOString().slice(0, 10).replace(/-/g, "/");
             //datepicker.data('daterangepicker').setStartDate(dateLimit_format);
-            datepicker.data('daterangepicker').setStartDate(today_format);
-            datepicker.data('daterangepicker').setEndDate(today_format);
+            if (datepicker.length != 0) {
+                datepicker.data('daterangepicker').setStartDate(today_format);
+                datepicker.data('daterangepicker').setEndDate(today_format);
+            }
             //$('#date-range-history').val(dateLimit_format + ' - ' + today_format);
             $('#date-range-history').val(today_format + ' ~ ' + today_format);
             //alert(" date-range-history = "+$('#date-range-history').val());
@@ -839,7 +841,7 @@
                 locale: { format: 'YYYY/MM/DD' },
                 opens: 'left'
             }, function (start, end, label) {
-                @* console.log("A new date selection was made: " + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));*@
+            @* console.log("A new date selection was made: " + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));*@
             });
 
             $('#date-range-exception').on('apply.daterangepicker', function (ev, picker) {
@@ -1652,7 +1654,6 @@
 
             datepicker.data('daterangepicker').setStartDate(dateLimit_format);
             datepicker.data('daterangepicker').setEndDate(today_format);
-
             $('#date-range-record').val(dateLimit_format + ' - ' + today_format);
             $('#date-range-record').trigger('change');
         }