diff --git a/modules/admin/lib/Controller/Menu.php b/modules/admin/lib/Controller/Menu.php
index bd1b2f4304ef621b3e695a7c244e2bb6f764940c..4892a1fd794f10de5d3a73a3df98045c63244cc2 100644
--- a/modules/admin/lib/Controller/Menu.php
+++ b/modules/admin/lib/Controller/Menu.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Module\admin\Controller;
 use SimpleSAML\Locale\Translate;
 use SimpleSAML\Module;
 use SimpleSAML\XHTML\Template;
+use Webmozart\Assert\Assert;
 
 /**
  * A class to handle the menu in admin pages.
@@ -88,6 +89,7 @@ final class Menu
     {
         $template->data['menu'] = $this->options;
         Module::callHooks('adminmenu', $template);
+        Assert::isInstanceOf($template, Template::class);
         return $template;
     }
 }
diff --git a/modules/cron/lib/Cron.php b/modules/cron/lib/Cron.php
index 128ddc8bcfdcbc9c58d18027854038f714b8d0a7..c75bc80c26d5e5132e9367f61ae8d039be6fbf0a 100644
--- a/modules/cron/lib/Cron.php
+++ b/modules/cron/lib/Cron.php
@@ -7,6 +7,7 @@ namespace SimpleSAML\Module\cron;
 use SimpleSAML\Configuration;
 use SimpleSAML\Logger;
 use SimpleSAML\Module;
+use Webmozart\Assert\Assert;
 
 /**
  * Handles interactions with SSP's cron system/hooks.
@@ -51,6 +52,7 @@ class Cron
         ];
 
         Module::callHooks('cron', $croninfo);
+        Assert::isArray($croninfo);
 
         foreach ($summary as $s) {
             Logger::debug('Cron - Summary: ' . $s);