diff --git a/course/modlib.php b/course/modlib.php
index 9ff364037fa..166c63832c7 100644
--- a/course/modlib.php
+++ b/course/modlib.php
@@ -233,12 +233,16 @@ function edit_module_post_actions($moduleinfo, $course, $eventname) {
             if (property_exists($moduleinfo, $elname) and $moduleinfo->$elname) {
                 // So we have a request for new outcome grade item?
                 if ($items) {
+                    $outcomeexists = false;
                     foreach($items as $item) {
                         if ($item->outcomeid == $outcome->id) {
-                            // Outcome aready exists.
-                            continue 2;
+                            $outcomeexists = true;
+                            break;
                         }
                     }
+                    if ($outcomeexists) {
+                        continue;
+                    }
                 }
 
                 $max_itemnumber++;