Reversed the order of the checks for None or a Dialog where a Window is expected so it doesn't crash under OSX/Mach-o.