diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 2fb50d07d2..a8652fb714 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -2070,12 +2070,12 @@ class ImportCsv
                         ";
 
                 $result = Database::query($sql);
-                $userCourseData = Database::fetch_array($result, 'ASSOC');
-                $teacherBackup[$userId][$courseInfo['code']] = $userCourseData;
-                if (isset($userCourseData['user_course_cat'])) {
-                     $this->logger->addError(
-                         "Saving user course category: user #$userId course: ".$courseInfo['code']." course cat: ".$userCourseData['user_course_cat']
-                    );
+                $rows = Database::num_rows($result);
+                if ($rows > 0) {
+                    $userCourseData = Database::fetch_array($result, 'ASSOC');
+                    if (!empty($userCourseData) && !empty($userCourseData['user_course_cat'])) {
+                        $teacherBackup[$userId][$courseInfo['code']] = $userCourseData;
+                    }
                 }
 
                 $sql = "SELECT * FROM ".Database::get_course_table(TABLE_GROUP_USER)."
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index b16c746255..cb76ae1d49 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -4794,9 +4794,12 @@ class SessionManager
                                                     ";
 
                                             $result = Database::query($sql);
-                                            $userCourseData = Database::fetch_array($result, 'ASSOC');
-                                            if (!empty($userCourseData)) {
-                                                $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData;
+                                            $rows = Database::num_rows($result);
+                                            if ($rows > 0) {
+                                                $userCourseData = Database::fetch_array($result, 'ASSOC');
+                                                if (!empty($userCourseData) && !empty($userCourseData['user_course_cat'])) {
+                                                    $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData;
+                                                }
                                             }
 
                                             $sql = "SELECT * FROM ".Database::get_course_table(TABLE_GROUP_USER)."
@@ -4923,9 +4926,12 @@ class SessionManager
                                                         ";
 
                                                 $result = Database::query($sql);
-                                                $userCourseData = Database::fetch_array($result, 'ASSOC');
-                                                if (!empty($userCourseData)) {
-                                                    $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData;
+                                                $rows = Database::num_rows($result);
+                                                if ($rows > 0) {
+                                                    $userCourseData = Database::fetch_array($result, 'ASSOC');
+                                                    if (!empty($userCourseData) && !empty($userCourseData['user_course_cat'])) {
+                                                        $teacherBackupList[$teacher['user_id']][$course_code] = $userCourseData;
+                                                    }
                                                 }
 
                                                 $sql = "SELECT * FROM ".Database::get_course_table(TABLE_GROUP_USER)."