diff --git a/inc/lib.packman.php b/inc/lib.packman.php
index 38281c0..b8d0d5f 100644
--- a/inc/lib.packman.php
+++ b/inc/lib.packman.php
@@ -58,22 +58,16 @@ class libPackman
 
     public static function modules($core, $modules, $type, $title)
     {
+        if (empty($modules) && !is_array($modules)) {
+            return null;
+        }
+
         $type = $type == 'themes' ? 'themes' : 'plugins';
 
         echo 
         '<div class="multi-part" ' .
         'id="packman-' . $type . '" title="' . $title . '">' .
-        '<h3>' . $title . '</h3>';
-
-        if (empty($modules) && !is_array($modules)) {
-            echo 
-            '<p><strong>' . __('There are no modules.') . '</strong></p>' .
-            '<div>';
-
-            return null;
-        }
-
-        echo
+        '<h3>' . $title . '</h3>' .
         '<form action="plugin.php" method="post">' .
         '<table class="clear"><tr>' .
         '<th class="nowrap">' . __('Id') . '</th>' .
@@ -124,6 +118,9 @@ class libPackman
 
     public static function repository($core, $modules, $type, $title)
     {
+        if (empty($modules) || !is_array($modules)) {
+            return null;
+        }
         if (!in_array($type, ['plugins', 'themes', 'repository'])) {
             return null;
         }
@@ -133,14 +130,6 @@ class libPackman
         'id="packman-repository-' . $type . '" title="' . $title . '">' .
         '<h3>' . $title . '</h3>';
 
-        if (empty($modules) || !is_array($modules)) {
-            echo 
-            '<p><strong>' . __('There are no packages') . '</strong></p>' .
-            '</div>';
-
-            return null;
-        }
-
         $combo_action = [__('delete') => 'delete'];
 
         if ($type == 'plugins' || $type == 'themes') {