diff --git a/adminsortable/admin.py b/adminsortable/admin.py
index aa3a239..9f11125 100644
--- a/adminsortable/admin.py
+++ b/adminsortable/admin.py
@@ -124,7 +124,8 @@ class SortableAdmin(ModelAdmin):
             'group_expression' : sortable_by_expression,
             'sortable_by_class' : sortable_by_class,
             'sortable_by_class_is_sortable' : sortable_by_class_is_sortable,
-            'sortable_by_class_display_name' : sortable_by_class_display_name
+            'sortable_by_class_display_name' : sortable_by_class_display_name,
+            'sortable_javascript_includes_template': self.sortable_javascript_includes_template
         }
         return render(request, self.sortable_change_list_template, context)
 
@@ -173,9 +174,8 @@ class SortableAdmin(ModelAdmin):
                     setattr(obj, 'order', start_index)
                     obj.save()
                     start_index += step
-
                 response = {'objects_sorted' : True}
-            except (Key, IndexError, klass.DoesNotExist, AttributeError):
+            except (KeyError, IndexError, klass.DoesNotExist, AttributeError):
                 pass
         else:
             response = {'objects_sorted' : False}
diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html
index 10a270e..2c88beb 100644
--- a/adminsortable/templates/adminsortable/change_list.html
+++ b/adminsortable/templates/adminsortable/change_list.html
@@ -8,7 +8,7 @@
 
 {% block extrahead %}
 	{{ block.super }}
-	{% include 'adminsortable/shared/javascript_includes.html' %}
+	{% include sortable_javascript_includes_template %}
 {% endblock %}
 
 {% block breadcrumbs %}