404 page addition

sandbox/urls.py

@@ -3,6 +3,7 @@ from django.conf import settings
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.conf.urls.static import static
+from django.views.generic import TemplateView
 
 from oscar.app import shop
 
@@ -14,4 +15,11 @@ urlpatterns = patterns('',
 )
 if settings.DEBUG:
     urlpatterns += staticfiles_urlpatterns()
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)  # Serve media when in debug
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    if settings.DEBUG:
+        urlpatterns += staticfiles_urlpatterns()
+        urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+        urlpatterns += patterns('',
+            url(r'^404$', TemplateView.as_view(template_name='404.html')),
+            url(r'^500$', TemplateView.as_view(template_name='500.html')),
+        )