diff --git a/twander.py b/twander.py
index 7185b34..f3a3bcc 100755
--- a/twander.py
+++ b/twander.py
@@ -6,7 +6,7 @@
 # Program Information
 
 PROGNAME = "twander"
-RCSID    = "$Id: twander.py,v 3.169 2005/01/25 03:37:22 tundra Exp $"
+RCSID    = "$Id: twander.py,v 3.170 2005/01/25 07:22:18 tundra Exp $"
 VERSION  = RCSID.split()[2]
 
 # Copyright Information
@@ -4146,21 +4146,24 @@
             if promptvar == YESNO:
                 default[defaultarg] = default[defaultarg].strip().lower()
 
-            # YESNO dialogs can only accept two arguments (we just made them case-insensitive above)
+                # YESNO dialogs can only accept two arguments (we just made them case-insensitive above)
+            
+                if (default[defaultarg] not in ("yes", "no", "")):
 
-            if (promptvar == YESNO) and (default[defaultarg] not in ("yes", "no", "")):
+                    # Display an error
+                    WrnMsg(wBADYESNODFLT % (default[defaultarg], name))
 
-                # Display an error
-
-                WrnMsg(wBADYESNODFLT % (default[defaultarg], name))
-
-                # Force a return
-                val = ""
+                    # We're done on an error
+                    return
 
             # Everything OK - Run the dialog
-            
-            else:
-                val = handler(name, prompt, **default)
+
+            # If there is no default argument, then don't pass anything at all - Tk gets confused if we do
+
+            if not default[defaultarg]:
+                default = {}
+
+            val = handler(name, prompt, **default)
 
             # Make sure our program gets focus back
             UI.DirList.focus()