diff --git a/data-table.js b/data-table.js
index 9149041..9d8a46d 100644
--- a/data-table.js
+++ b/data-table.js
@@ -260,7 +260,7 @@ class DataTable extends IgniteElement {
                 onChange: (oldValue, newValue) => {
                     //If the currentPage is greater than the new page count, set it to the last page.
                     if (this.currentPage > newValue - 1) {
-                        this.currentPage = newValue - 1;
+                        this.currentPage = Math.max(0, newValue - 1);
                     }
                 }
             }),
@@ -305,7 +305,7 @@ class DataTable extends IgniteElement {
                     ),
 
                     //Row count
-                    new span().show(this.showRowCount).class(this.rowCountClass).innerHTML(this.filtered, filtered => filtered.length == 0 ? "No rows" : `${filtered.length} ${(filtered.length < 2 ? "row" : "rows")}`),
+                    new span().show(this.showRowCount).class(this.rowCountClass).innerHTML(this.filtered, filtered => (!filtered || filtered.length == 0) ? "No rows" : `${filtered.length} ${(filtered.length < 2 ? "row" : "rows")}`),
 
                     //Refresh button
                     new button().show(this.showRefreshButton).class(this.refreshButtonClass).child(new i().class("fa-solid fa-arrows-rotate")).onClick(async () => {