diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index cf0f4a4a89..0040fc6778 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1168,7 +1168,7 @@ class ImportCsv
                             $courseInfo['code']
                         );
                         break;
-                   case 'drh':
+                    case 'drh':
                         $userInfo = api_get_user_info($userId);
                         SessionManager::suscribe_sessions_to_hr_manager(
                             $userInfo,
@@ -1289,7 +1289,6 @@ class ImportCsv
                     $this->logger->addError('User does not exists: '.$chamiloUserName);
                     continue;
                 }
-                $status = null;
                 switch ($type) {
                     case 'student':
                         SessionManager::subscribe_users_to_session_course(
@@ -1624,7 +1623,7 @@ class ImportCsv
                     $this->logger->addError('User does not exists: '.$chamiloUserName);
                     continue;
                 }
-                $status = null;
+
                 switch ($type) {
                     case 'student':
                         SessionManager::subscribe_users_to_session_course(
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index 0f5c95a1c6..7d0f0da95f 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -5164,7 +5164,11 @@ class CourseManager
                     // Remove old and add new
                     if ($deleteSessionTeacherNotInList) {
                         foreach ($teachers as $userId) {
-                            SessionManager::set_coach_to_course_session($userId, $session['id'], $courseId);
+                            SessionManager::set_coach_to_course_session(
+                                $userId,
+                                $session['id'],
+                                $courseId
+                            );
                         }
 
                         $teachersToDelete = array();
@@ -5174,14 +5178,22 @@ class CourseManager
 
                         if (!empty($teachersToDelete)) {
                             foreach ($teachersToDelete as $userId) {
-                                SessionManager::set_coach_to_course_session($userId, $session['id'], $courseId,
-                                    true);
+                                SessionManager::set_coach_to_course_session(
+                                    $userId,
+                                    $session['id'],
+                                    $courseId,
+                                    true
+                                );
                             }
                         }
                     } else {
                         // Add new teachers only
                         foreach ($teachers as $userId) {
-                            SessionManager::set_coach_to_course_session($userId, $session['id'], $courseId);
+                            SessionManager::set_coach_to_course_session(
+                                $userId,
+                                $session['id'],
+                                $courseId
+                            );
                         }
                     }
                 }
diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php
index 9a1e141b4b..29cbab6c4c 100755
--- a/main/inc/lib/sessionmanager.lib.php
+++ b/main/inc/lib/sessionmanager.lib.php
@@ -2776,6 +2776,11 @@ class SessionManager
             $session_id = api_get_session_id();
         }
 
+        if (empty($session_id)) {
+            return false;
+        }
+
+
         if (!empty($courseId)) {
             $courseId = intval($courseId);
         } else {
@@ -2828,10 +2833,11 @@ class SessionManager
                                 c_id = $courseId AND
                                 user_id = $user_id ";
                     $result = Database::query($sql);
-                    if (Database::affected_rows($result) > 0)
+                    if (Database::affected_rows($result) > 0) {
                         return true;
-                    else
+                    } else {
                         return false;
+                    }
                 }
             } else {
                 // Assign user as a coach to course