diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index 53142f00436..f7d00206c96 100644
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -483,6 +483,17 @@ function xmldb_assign_upgrade($oldversion) {
         // Assign savepoint reached.
         upgrade_mod_savepoint(true, 2014010801, 'assign');
     }
+    // Moodle v2.7.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2014051201) {
+
+        // Cleanup bad database records where assignid is missing.
+
+        $DB->delete_records('assign_user_mapping', array('assignment'=>0));
+        // Assign savepoint reached.
+        upgrade_mod_savepoint(true, 2014051201, 'assign');
+    }
 
     return true;
 }
diff --git a/mod/assign/version.php b/mod/assign/version.php
index c5a4c7ad58d..5c74a7a468a 100644
--- a/mod/assign/version.php
+++ b/mod/assign/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
-$plugin->version  = 2014051200;    // The current module version (Date: YYYYMMDDXX).
+$plugin->version  = 2014051201;    // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2014050800;    // Requires this Moodle version.
 $plugin->cron     = 60;