diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 9351d1abb1d..9264e090490 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -74,7 +74,9 @@ function choice_add_instance($choice) {
                     $option = NULL;
                     $option->text = $value;
                     $option->choiceid = $choice->id;
-                    $option->maxanswers = $choice->{'newlimit'.substr($name, 9)};
+                    if (isset($choice->{'newlimit'.substr($name, 9)})) {
+                        $option->maxanswers = $choice->{'newlimit'.substr($name, 9)};
+                    }
                     $option->timemodified = time();
                     insert_record("choice_options", $option);                
                 }