diff --git a/app/controllers/course/courseware.php b/app/controllers/course/courseware.php
index 76f5105ff9f2205adec8c944601496f71f7d11b6..30ab5f166ef2c8220d1159d505026ce9ede3930a 100644
--- a/app/controllers/course/courseware.php
+++ b/app/controllers/course/courseware.php
@@ -67,7 +67,7 @@ class Course_CoursewareController extends CoursewareController
         $lastStructuralElement = \Courseware\StructuralElement::findOneById($last);
 
         if ($unit_id === null) {
-            if ($lastStructuralElement->canVisit(User::findCurrent())) {
+            if (isset($lastStructuralElement) && $lastStructuralElement->canVisit(User::findCurrent())) {
                 $this->redirectToFirstUnit('course', Context::getId(), $last);
             } else {
                 $this->redirectToFirstUnit('course', Context::getId(), []);
@@ -79,7 +79,7 @@ class Course_CoursewareController extends CoursewareController
         $this->unit_id = null;
         $unit = Unit::find($unit_id);
         if (isset($unit)) {
-            if ($lastStructuralElement->canVisit($user)) {
+            if (isset($lastStructuralElement) && $lastStructuralElement->canVisit($user)) {
                 $this->setEntryElement('course', $unit, $last, Context::getId());
             } else {
                 $rootElement = [Context::getId() => $unit->structural_element->id];