diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 70bf86e98205129800daf4b5cd040a341ce6628a..eb6032d9df077590978fe6627470b302de252d9a 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -247,10 +247,10 @@ class JsupdaterController extends AuthenticatedController
         Questionnaire::findEachMany(
             function (Questionnaire $questionnaire) use ($pageInfo, &$data) {
                 if ($questionnaire->latestAnswerTimestamp() > $pageInfo['questionnaire']['last_update']) {
-                    $template = $this->get_template_factory()->open("questionnaire/evaluate");
-                    $template->filtered = $pageInfo['questionnaire']['filtered'];
+                    $template = $this->get_template_factory()->open('questionnaire/evaluate');
+                    $template->questionnaire = $questionnaire;
+                    $template->filtered = $pageInfo['questionnaire']['filtered'] ?? [];
                     $template->set_layout(null);
-                    $template->set_attribute("questionnaire", $questionnaire);
                     $data[$questionnaire->id] = [
                         'html' => $template->render()
                     ];
diff --git a/app/views/admin/plugin/manifest.php b/app/views/admin/plugin/manifest.php
index 17d9bae258430a11b7ef8896d3958bd35d33d3a5..8f61111c7bd8aed0e93bf6e7931e6cefc1b40047 100644
--- a/app/views/admin/plugin/manifest.php
+++ b/app/views/admin/plugin/manifest.php
@@ -15,10 +15,10 @@
     <dd><?= join(', ', $plugin['type']) ?></dd>
 
     <dt><?= _('Origin') ?></dt>
-    <dd><?= htmlReady($manifest['origin']) ?></dd>
+    <dd><?= htmlReady($manifest['origin'] ?? '?') ?></dd>
 
     <dt><?= _('Version') ?></dt>
-    <dd><?= htmlReady($manifest['version']) ?></dd>
+    <dd><?= htmlReady($manifest['version'] ?? '?') ?></dd>
 
     <dt><?= _('Beschreibung') ?></dt>
     <dd>
diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php
index 3011a26595c2c03e94a394d0e04ef29abed291a3..d349aa1ec899ecad6c90cd2acba69466e13dc968 100644
--- a/lib/models/WikiPage.class.php
+++ b/lib/models/WikiPage.class.php
@@ -141,7 +141,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
         ) {
             return true;
         }
-        if ($user_id === null) {
+        if ($user_id === null && User::findCurrent()) {
             $user_id = User::findCurrent()->id;
         }
 
@@ -174,7 +174,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
      */
     public function isEditable(?string $user_id = null): bool
     {
-        if ($user_id === null) {
+        if ($user_id === null && User::findCurrent()) {
             $user_id = User::findCurrent()->id;
         }
         if ($GLOBALS['perm']->have_studip_perm(