diff --git a/app/views/materialien/files/index.php b/app/views/materialien/files/index.php
index 1b00cec3d4de90fe0054abe2f537361cfa17876f..538d97a38c03e2754c0543843fe26369edf32b87 100644
--- a/app/views/materialien/files/index.php
+++ b/app/views/materialien/files/index.php
@@ -109,7 +109,7 @@
                 $pagination->set_attribute('num_postings', $count);
                 $pagination->set_attribute('page', $page);
                 // ARGH!
-                $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_files=%s';
+                $page_link = explode('?', $controller->action_url('index'))[0] . '?page_files=%s';
                 $pagination->set_attribute('pagelink', $page_link);
                 echo $pagination->render("shared/pagechooser");
                 ?>
diff --git a/lib/models/MvvFile.php b/lib/models/MvvFile.php
index 44d908e349cc80bc6048c1e1c779d75c1ee7cc91..e3c0e3cd8d515879d217492bd64dc0a94f5d9343 100644
--- a/lib/models/MvvFile.php
+++ b/lib/models/MvvFile.php
@@ -92,7 +92,7 @@ class MvvFile extends ModuleManagementModel
      */
     public function getRangeType()
     {
-        if ($this->ranges) {
+        if (count($this->ranges) > 0) {
             return $this->ranges[0]->range_type;
         }
         return '';