Merge branch 'main' into issue-3911issue-3911

1 files changed, 7 insertions, 3 deletions

diff --git a/app/controllers/course/messenger.php b/app/controllers/course/messenger.php
index 3e692aa..710ac87 100644
--- a/app/controllers/course/messenger.php
+++ b/app/controllers/course/messenger.php
@@ -12,16 +12,20 @@ class Course_MessengerController extends AuthenticatedController
 
     public function course_action($thread_id = null)
     {
-        if (Context::get()) {
-            PageLayout::setTitle(Context::get()->getFullName() . ' - ' . _('Blubber'));
+        $context = Context::get();
+
+        if (!$context) {
+            throw new CheckObjectException(_('Sie haben kein Objekt gewählt.'));
         }
 
         if (Navigation::hasItem('/course/blubber')) {
             Navigation::activateItem('/course/blubber');
         }
 
+        PageLayout::setTitle($context->getFullName() . ' - ' . _('Blubber'));
+
         $this->search = '';
-        $this->threads = BlubberThread::findByContext(Context::get()->id, true, Context::getType());
+        $this->threads = BlubberThread::findByContext($context->id, true, Context::getType());
         $this->thread = null;
         $this->threads_more_down = 0;