diff --git a/manage.py b/manage.py
index f53698576f..4849ad4c37 100755
--- a/manage.py
+++ b/manage.py
@@ -3,6 +3,10 @@ import os
 import sys
 
 if __name__ == "__main__":
+
+    if "--no-traceback" not in sys.argv and len(sys.argv) > 1:
+        sys.argv.append("--traceback")
+
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "humbug.settings")
 
     from django.core.management import execute_from_command_line