diff --git a/direct/src/doc/pandaUserGuide.doc b/direct/src/doc/pandaUserGuide.doc
index 556b6f5507..776f7d264a 100644
Binary files a/direct/src/doc/pandaUserGuide.doc and b/direct/src/doc/pandaUserGuide.doc differ
diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index c123b69412..8d1c89642c 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -295,7 +295,7 @@ def adjust(command = None, parent = None, **kw):
     base.wantDIRECT = 1
     base.wantTk = 1
     import TkGlobal
-    from Tkinter import *
+    import Tkinter
     import EntryScale
     import Pmw
     # Create toplevel if needed
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index 8564ec25eb..2c55030520 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -52,6 +52,8 @@ class ShowBase:
         self.wantStats = self.config.GetBool('want-stats', 0)
 
         taskMgr.taskTimerVerbose = self.config.GetBool('task-timer-verbose', 0)
+        taskMgr.extendedExceptions = self.config.GetBool('extended-exceptions', 0)
+        
         taskMgr.pStatsTasks = self.config.GetBool('pstats-tasks', 0)
 
         # Set up the TaskManager to reset the PStats clock back
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index f633ee2beb..514567f058 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -312,6 +312,7 @@ class TaskManager:
         if (TaskManager.notify == None):
             TaskManager.notify = directNotify.newCategory("TaskManager")
         self.taskTimerVerbose = 0
+        self.extendedExceptions = 0
         self.pStatsTasks = 0
         self.resumeFunc = None
         self.fVerbose = 0
@@ -501,9 +502,11 @@ class TaskManager:
                 except KeyboardInterrupt:
                     self.stop()
                 except:
-                    # self.stop()
-                    # print_exc_plus()
-                    raise
+                    if self.extendedExceptions:
+                        self.stop()
+                        print_exc_plus()
+                    else:
+                        raise
 
     def stop(self):
         # Set a flag so we will stop before beginning next frame