diff --git a/modules/dupcheck/controllers/dupcheck.php b/modules/dupcheck/controllers/dupcheck.php
index 8433024..61240c4 100755
--- a/modules/dupcheck/controllers/dupcheck.php
+++ b/modules/dupcheck/controllers/dupcheck.php
@@ -74,15 +74,17 @@ class dupcheck_Controller extends Controller {
       ->find_all($page_size, $offset);
 
     // Set up the previous and next page buttons.
-    if ($page > 1) {
-      $previous_page = $page - 1;
-      $view->previous_page_link = url::site("dupcheck/dupes?page={$previous_page}");
-    }
-    if ($page < $max_pages) {
-      $next_page = $page + 1;
-      $view->next_page_link = url::site("dupcheck/dupes?page={$next_page}");
-    }
-
+    // Commented out for causing crash with null assigns
+/**
+*    if ($page > 1) {
+*      $previous_page = $page - 1;
+*      $view->previous_page_link = url::site("dupcheck/dupes?page={$previous_page}");
+*    }
+*    if ($page < $max_pages) {
+*      $next_page = $page + 1;
+*      $view->next_page_link = url::site("dupcheck/dupes?page={$next_page}");
+*    }
+**/
     // Set up and display the actual page.
     $template = new Theme_View("page.html", "collection", "DuplicatePhotos");
     $template->page_title = t("Gallery :: Duplicate Photos");
diff --git a/modules/dupcheck/views/dupespage.html.php b/modules/dupcheck/views/dupespage.html.php
index ef0d033..e620993 100755
--- a/modules/dupcheck/views/dupespage.html.php
+++ b/modules/dupcheck/views/dupespage.html.php
@@ -6,6 +6,8 @@
   <h1><?= html::clean($title) ?></h1>
 </div>
 
+<?= $theme->paginator() ?>
+
 <ul id="g-album-grid" class="ui-helper-clearfix">
   <? foreach ($children as $i => $child): ?>
   <li class="g-item <?= $child->is_album() ? "g-album" : "" ?>">
@@ -49,6 +51,7 @@ foreach( db::build()
   </li>
   <? endforeach ?>
 </ul>
-<?= $theme->dynamic_bottom() ?>
 
 <?= $theme->paginator() ?>
+
+<?= $theme->dynamic_bottom() ?>