diff --git a/app/models/run.js b/app/models/run.js
index 1937654..2df9e37 100644
--- a/app/models/run.js
+++ b/app/models/run.js
@@ -8,10 +8,19 @@ export default DS.Model.extend({
   name: DS.attr(),
   start: DS.attr(),
   end: DS.attr(),
+  enrollmentStart: DS.attr (),
+  enrollmentEnd: DS.attr (),
   isFree: DS.attr(),
   price: DS.attr(),
   runAttemptId: DS.attr(),
   course: DS.belongsTo('course'),
   user: DS.belongsTo('user'),
-  percentComplete: DS.attr()
+  percentComplete: DS.attr(),
+  isEnded: Ember.computed ('end', function () {
+    const now = Math.floor (((new Date ()).getTime ()) / 1000),
+      endTime = this.get ('end')
+    ;
+
+    return (now >= endTime)
+  })
 })
diff --git a/app/pods/classroom/run/index/route.js b/app/pods/classroom/run/index/route.js
index 6ab6a33..2944082 100644
--- a/app/pods/classroom/run/index/route.js
+++ b/app/pods/classroom/run/index/route.js
@@ -1,9 +1,17 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
+  notify: Ember.inject.service (),
+
   model () {
     return this.modelFor('classroom.run')
   },
+  afterModel (model, transition) {
+    if (model.get ('isEnded')) {
+      this.get ('notify').alert ('That batch has ended. Please buy the course again.')
+      return this.transitionTo ('courses.preview', model.get ('course'))
+    }
+  },
   setupController (controller, model) {
     controller.set('run', model);
     controller.set('course', model.get('course'));