diff --git a/applications/modules.moon b/applications/modules.moon
index 9d3d5d8..9dbd5b5 100644
--- a/applications/modules.moon
+++ b/applications/modules.moon
@@ -221,16 +221,15 @@ class MoonRocksModules extends lapis.Application
     @title = "All modules in #{label.name}"
 
     lmod = LabelsModules\select "where label_id = ?", label.id
-    query_ids = {0}
-    for lm in *lmod
-      table.insert(query_ids,lm.module_id)
 
-    query_ids = table.concat(query_ids,",")
+    if next lmod
+      query_ids = table.concat [lm.module_id for lm in *lmod], ","
+      modules = Modules\paginated "where id in (#{query_ids})"
 
-    paginated_modules @, (Modules\paginated "where id in (#{query_ids})"), {
-      per_page: 50
-      fields: "id, name, display_name, user_id, downloads, summary"
-    }
+      paginated_modules @, (modules), {
+        per_page: 50
+        fields: "id, name, display_name, user_id, downloads, summary"
+      }
 
     render: true
 
diff --git a/views/modules_label.moon b/views/modules_label.moon
index e083345..e2dcb1c 100644
--- a/views/modules_label.moon
+++ b/views/modules_label.moon
@@ -3,10 +3,13 @@ class Modules extends require "widgets.page"
     h2 ->
       text @title
       text " "
-      span class: "header_count", "(#{@pager\total_items!})"
+      span class: "header_count", "(#{@pager and @pager\total_items! or 0})"
 
-    @render_pager @pager
-    @render_modules @modules
-    @render_pager @pager
+    if @pager
+	    @render_pager @pager
+	    @render_modules @modules
+	    @render_pager @pager
+	  else
+	   	text "No modules"