diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index b43e4b09bb4..82076f932fc 100644
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -111,6 +111,7 @@ $string['createfirst'] = 'You must create some short-answer questions first. ';
 $string['createmultiple'] = 'Add several random questions to quiz';
 $string['createnewquestion'] = 'Create new question';
 $string['custom'] = 'Custom format';
+$string['dataitemneed'] = 'You need to add at least one set of data items to get a valid question';
 $string['datasetdefinitions'] = 'Reusable dataset definitions for category $a';
 $string['datasetnumber'] = 'Number';
 $string['daysavailable'] = 'Days available';
diff --git a/question/type/datasetdependent/datasetitems.php b/question/type/datasetdependent/datasetitems.php
index 41748984afa..36cc7d85e48 100644
--- a/question/type/datasetdependent/datasetitems.php
+++ b/question/type/datasetdependent/datasetitems.php
@@ -17,6 +17,7 @@
     $streditdatasets = get_string("editdatasets", "quiz");
     $strreuseifpossible = get_string('reuseifpossible', 'quiz');
     $strforceregeneration = get_string('forceregeneration', 'quiz');
+    $strdataitemneed = get_string('dataitemneed', 'quiz');
 
     if (empty($question->id)) {
         $datasetdefs = $this->get_dataset_definitions(
@@ -270,14 +271,17 @@
             <input type=\"hidden\" name=\"wizardpage\" value=\"datasetitems\"/>";
         print_table($table);
         echo '</form>';
+
+        echo "<center><br /><br /><form method=\"post\" action=\"question.php\">
+              <input type=\"hidden\" name=\"id\" value=\"$question->id\"/>
+              <input type=\"hidden\" name=\"category\" value=\"$question->category\"/>
+              <input type=\"hidden\" name=\"qtype\" value=\"$question->qtype\"/>
+              <input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\"/>
+              <input type=\"hidden\" name=\"wizardpage\" value=\"datasetitems\"/>
+              <input type=\"submit\" name=\"backtoquiz\" value=\"$strbacktoquiz\">
+              </form></center>\n";
+    } else {
+          notify( $strdataitemneed );
     }
 
-    echo "<center><br /><br /><form method=\"post\" action=\"question.php\">
-          <input type=\"hidden\" name=\"id\" value=\"$question->id\"/>
-          <input type=\"hidden\" name=\"category\" value=\"$question->category\"/>
-          <input type=\"hidden\" name=\"qtype\" value=\"$question->qtype\"/>
-          <input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\"/>
-          <input type=\"hidden\" name=\"wizardpage\" value=\"datasetitems\"/>
-          <input type=\"submit\" name=\"backtoquiz\" value=\"$strbacktoquiz\">
-          </form></center>\n";
 ?>