diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 9ede9db536e..b12c00c54dd 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -5978,7 +5978,7 @@ class assign {
         if ($instance->teamsubmission) {
             $teamsubmission = $this->get_group_submission($user->id, 0, false, -1, true);
             // Check if the group allows to view peers.
-            if($teamsubmission->groupid != 0){
+            if($teamsubmission !== false && $teamsubmission->groupid != 0){
                 $group = groups_get_group($teamsubmission->groupid);
                 $isblindgroup = $group->participation === '0';
             }else{
diff --git a/mod/assign/tests/locallib_test.php b/mod/assign/tests/locallib_test.php
index 71fca819d02..8020045ffbb 100644
--- a/mod/assign/tests/locallib_test.php
+++ b/mod/assign/tests/locallib_test.php
@@ -4680,13 +4680,16 @@ Anchor link 2:<a title=\"bananas\" href=\"../logo-240x60.gif\">Link text</a>
         $this->resetAfterTest();
         // Create 2 courses one without blind groups, the other with.
         $coursea = $this->getDataGenerator()->create_course();
-        $groupa1 = $this->getDataGenerator()->create_group(['courseid' => $coursea->id, 'participation'=> 1]);
-        $groupa2 = $this->getDataGenerator()->create_group(['courseid' => $coursea->id, 'participation'=> 1]);
-        $assigna =$assign = $this->create_instance($coursea);
         $courseb = $this->getDataGenerator()->create_course();
-        $groupb1 = $this->getDataGenerator()->create_group(['courseid' => $courseb->id, 'participation'=> 1]);
-        $groupb2 = $this->getDataGenerator()->create_group(['courseid' => $courseb->id, 'participation'=> 0]);
-        $assignb =$assign = $this->create_instance($courseb);
+
+        $this->getDataGenerator()->create_group(['courseid' => $coursea->id, 'participation'=> 1]);
+        $this->getDataGenerator()->create_group(['courseid' => $coursea->id, 'participation'=> 1]);
+        $this->getDataGenerator()->create_group(['courseid' => $courseb->id, 'participation'=> 1]);
+        $this->getDataGenerator()->create_group(['courseid' => $courseb->id, 'participation'=> 0]);
+
+        $assigna = $this->create_instance($coursea);
+        $assignb = $this->create_instance($courseb);
+
         $this->assertFalse($assigna->testable_is_anygroup_without_participation($coursea->id));
         $this->assertTrue($assignb->testable_is_anygroup_without_participation($courseb->id));
     }