diff --git a/app/templates/home.html b/app/templates/home.html
index 8f462d8..da580ef 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -3,53 +3,55 @@
 {% load static i18n django_bootstrap_breadcrumbs permission_tags %}
 
 {% block javascript %}
-	<script type="text/javascript">
-		var pageNum = {{ page_obj.number }}; // The latest page loaded
-		var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
-		var baseUrl = '{% url "app:index" %}';
+	{% if page_obj %}
+		<script type="text/javascript">
+			var pageNum = {{ page_obj.number }}; // The latest page loaded
+			var numberPages = {{ paginator.num_pages }}; // Indicates the number of pages
+			var baseUrl = '{% url "app:index" %}';
 
-		// loadOnScroll handler
-		var loadOnScroll = function() {
-		   // If the current scroll position is past out cutoff point...
-		    if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
-		        // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
-		        $(window).unbind();
-		        // execute the load function below that will visit the view and return the content
-		        loadItems();
-		    }
-		};
+			// loadOnScroll handler
+			var loadOnScroll = function() {
+			   // If the current scroll position is past out cutoff point...
+			    if ($(window).scrollTop() >= $(document).height() - $(window).height() - 10) {
+			        // temporarily unhook the scroll event watcher so we don't call a bunch of times in a row
+			        $(window).unbind();
+			        // execute the load function below that will visit the view and return the content
+			        loadItems();
+			    }
+			};
 
-		var loadItems = function() {
-		    // Check if page is equal to the number of pages
-		    if (pageNum == numberPages) {
-		        return false
-		    }
-		    // Update the page number
-		    pageNum = pageNum + 1;
+			var loadItems = function() {
+			    // Check if page is equal to the number of pages
+			    if (pageNum == numberPages) {
+			        return false
+			    }
+			    // Update the page number
+			    pageNum = pageNum + 1;
 
-		    $("#loading").show();
-		    // Configure the url we're about to hit
-		    setTimeout(function (){
-			    $.ajax({
-			        url: baseUrl,
-			        data: {'page': pageNum},
-			        success: function(data) {
-			            $("#loading").hide();
+			    $("#loading").show();
+			    // Configure the url we're about to hit
+			    setTimeout(function (){
+				    $.ajax({
+				        url: baseUrl,
+				        data: {'page': pageNum},
+				        success: function(data) {
+				            $("#loading").hide();
 
-			            $("#timeline").append(data);
-			        },
-			        complete: function(data, textStatus){
-			            // Turn the scroll monitor back on
-			            $(window).bind('scroll', loadOnScroll);
-			        }
-			    });
-		    }, 1000)
-		};
+				            $("#timeline").append(data);
+				        },
+				        complete: function(data, textStatus){
+				            // Turn the scroll monitor back on
+				            $(window).bind('scroll', loadOnScroll);
+				        }
+				    });
+			    }, 1000)
+			};
 
-		$(document).ready(function(){
-		   $(window).bind('scroll', loadOnScroll);
-		});
-	</script>
+			$(document).ready(function(){
+			   $(window).bind('scroll', loadOnScroll);
+			});
+		</script>
+	{% endif %}
 {% endblock %}
 
 {% block breadcrumbs %}
diff --git a/app/views.py b/app/views.py
index e60b23f..87c1d2d 100644
--- a/app/views.py
+++ b/app/views.py
@@ -18,8 +18,6 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin):
 	context_object_name = 'objects'
 	paginate_by = 10
 
-	
-
 	def get_queryset(self):
 		if self.request.user.is_staff:
 			objects = Course.objects.all()
diff --git a/courses/migrations/0005_auto_20161021_1749.py b/courses/migrations/0005_auto_20161021_1749.py
new file mode 100644
index 0000000..afed17c
--- /dev/null
+++ b/courses/migrations/0005_auto_20161021_1749.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-21 20:49
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0004_auto_20161020_1808'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subject',
+            name='students',
+            field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
+        ),
+    ]
--
libgit2 0.21.2