diff --git a/web/secondary_toolbar.js b/web/secondary_toolbar.js
index 2775016d6..7b6b5858c 100644
--- a/web/secondary_toolbar.js
+++ b/web/secondary_toolbar.js
@@ -101,7 +101,9 @@ var SecondaryToolbar = {
   },
 
   lastPageClick: function secondaryToolbarLastPageClick(evt) {
-    PDFView.page = PDFView.pdfDocument.numPages;
+    if (PDFView.pdfDocument) {
+      PDFView.page = PDFView.pdfDocument.numPages;
+    }
     this.close();
   },
 
diff --git a/web/viewer.js b/web/viewer.js
index f44d500e3..a3636645d 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -2376,8 +2376,8 @@ window.addEventListener('keydown', function keydown(evt) {
         }
         break;
       case 35: // end
-        if (PresentationMode.active ||
-            PDFView.page < PDFView.pdfDocument.numPages) {
+        if (PresentationMode.active || (PDFView.pdfDocument &&
+            PDFView.page < PDFView.pdfDocument.numPages)) {
           PDFView.page = PDFView.pdfDocument.numPages;
           handled = true;
         }