diff --git a/mod/quiz/export.php b/mod/quiz/export.php
index 53ba8335440..082108c7deb 100644
--- a/mod/quiz/export.php
+++ b/mod/quiz/export.php
@@ -5,16 +5,22 @@
     require_once("locallib.php");
 
     require_variable($category);
+    $courseid = required_param('course',PARAM_INT);
     optional_variable($format);
+    
 
     if (! $category = get_record("quiz_categories", "id", $category)) {
         error("This wasn't a valid category!");
     }
 
-    if (! $course = get_record("course", "id", $category->course)) {
+    if (! $categorycourse = get_record("course", "id", $category->course)) {
         error("This category doesn't belong to a valid course!");
     }
 
+    if (! $course = get_record("course", "id", $courseid )) {
+        error("Course does not exist!");
+    }
+
     require_login($course->id, false);
 
     if (!isteacher($course->id)) {
@@ -100,7 +106,7 @@
     print_heading_with_help($strexportquestions, "export", "quiz");
 
     print_simple_box_start("center");
-    echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"export.php\">";
+    echo "<form enctype=\"multipart/form-data\" method=\"post\" action=\"export.php?course=$courseid\">";
     echo "<table cellpadding=\"5\">";
 
     echo "<tr><td align=\"right\">";