diff --git a/main/exercise/TestCategory.php b/main/exercise/TestCategory.php
index dcbb021c29..5e72707d29 100644
--- a/main/exercise/TestCategory.php
+++ b/main/exercise/TestCategory.php
@@ -15,8 +15,8 @@ class TestCategory
     public $name;
     public $description;
 
-	/**
-	 * Constructor of the class Category
+    /**
+     * Constructor of the class Category
      */
     public function __construct()
     {
@@ -1054,7 +1054,7 @@ class TestCategory
      *
      * @return string|false
      */
-    public static function add_category_for_question_id($categoryId, $questionId, $courseId)
+    public static function addCategoryToQuestion($categoryId, $questionId, $courseId)
     {
         $table = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);
         // if question doesn't have a category
diff --git a/main/exercise/upload_exercise.php b/main/exercise/upload_exercise.php
index c8137206af..14c1b00a16 100755
--- a/main/exercise/upload_exercise.php
+++ b/main/exercise/upload_exercise.php
@@ -354,7 +354,7 @@ function lp_upload_quiz_action_handling()
                     );
 
                     if (!empty($categoryId)) {
-                        TestCategory::add_category_for_question_id(
+                        TestCategory::addCategoryToQuestion(
                             $categoryId,
                             $question_id,
                             $courseId
diff --git a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
index 8f54f02e38..4c5c1ce45d 100644
--- a/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
+++ b/src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php
@@ -2102,12 +2102,11 @@ class CourseRestorer
      */
     public function restore_test_category($session_id, $respect_base_content, $destination_course_code)
     {
-        $course_id = api_get_course_int_id();
+        $destinationCourseId = $this->destination_course_info['real_id'];
         // Let's restore the categories
         $categoryOldVsNewList = array(); // used to build the quiz_question_rel_category table
         if ($this->course->has_resources(RESOURCE_TEST_CATEGORY)) {
             $resources = $this->course->resources;
-            $destinationCourseId = $this->destination_course_info['real_id'];
             foreach ($resources[RESOURCE_TEST_CATEGORY] as $id => $courseCopyTestCategory) {
                 $categoryOldVsNewList[$courseCopyTestCategory->source_id] = $id;
                 // check if this test_category already exist in the destination BDD
@@ -2159,20 +2158,21 @@ class CourseRestorer
         // to redo the link between test_category and quizzes question for questions restored
         // we can use the source_id field
         // question source_id => category source_id
-        if ($this->course->has_resources(RESOURCE_QUIZQUESTION)) {
+        if (!empty($newQuestionId) && $this->course->has_resources(RESOURCE_QUIZQUESTION)) {
             // check the category number of each question restored
             if (!empty($resources[RESOURCE_QUIZQUESTION])) {
                 foreach ($resources[RESOURCE_QUIZQUESTION] as $id => $courseCopyQuestion) {
                     $newQuestionId = $resources[RESOURCE_QUIZQUESTION][$id]->destination_id;
                     $questionCategoryId = $courseCopyQuestion->question_category;
-                    if ($newQuestionId > 0) {
-                        if ($questionCategoryId > 0 && isset($categoryOldVsNewList[$questionCategoryId])) {
-                            TestCategory::add_category_for_question_id(
-                                $categoryOldVsNewList[$questionCategoryId],
-                                $newQuestionId,
-                                $destinationCourseId
-                            );
-                        }
+                    if ($newQuestionId > 0 &&
+                        $questionCategoryId > 0 &&
+                        isset($categoryOldVsNewList[$questionCategoryId])
+                    ) {
+                        TestCategory::addCategoryToQuestion(
+                            $categoryOldVsNewList[$questionCategoryId],
+                            $newQuestionId,
+                            $destinationCourseId
+                        );
                     }
                 }
             }
@@ -2192,7 +2192,6 @@ class CourseRestorer
 			$table_ans = Database::get_course_table(TABLE_SURVEY_QUESTION_OPTION);
 			$resources = $this->course->resources;
 			foreach ($resources[RESOURCE_SURVEY] as $id => $survey) {
-
 				$sql = 'SELECT survey_id FROM '.$table_sur.'
                         WHERE
                             c_id = '.$this->destination_course_id.' AND