diff --git a/netbox/netbox/views/errors.py b/netbox/netbox/views/errors.py
index a81d45cb5..ad02f5a63 100644
--- a/netbox/netbox/views/errors.py
+++ b/netbox/netbox/views/errors.py
@@ -1,3 +1,4 @@
+import os
 import platform
 import sys
 
@@ -49,10 +50,13 @@ def handler_500(request, template_name=ERROR_500_TEMPLATE_NAME):
     except TemplateDoesNotExist:
         return HttpResponseServerError('<h1>Server Error (500)</h1>', content_type='text/html')
     type_, error, traceback = sys.exc_info()
-
+    fname = os.path.split(traceback.tb_frame.f_code.co_filename)[1]
+    lineno = traceback.tb_lineno
     return HttpResponseServerError(template.render({
         'error': error,
         'exception': str(type_),
+        'fname': fname,
+        'lineno': lineno,
         'netbox_version': settings.VERSION,
         'python_version': platform.python_version(),
         'plugins': get_installed_plugins(),
diff --git a/netbox/templates/500.html b/netbox/templates/500.html
index 0257e7c43..0e3da74ef 100644
--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -29,6 +29,8 @@
 <pre class="block"><strong>{{ exception }}</strong><br />
 {{ error }}
 
+file: {{ fname }} line: {{ lineno }}
+
 Python version: {{ python_version }}
 NetBox version: {{ netbox_version }}
 Plugins: {% for plugin, version in plugins.items %}