qconfig fails when no E-mail address in whoami

Context:

My whoami does not list an E-mail address. I'm just experimenting so far and so did not bother to list one. But qconfig has problems handling this (on Mac OS X 10.5.3). Other qbzr commands seem to be generally working.

Problem as reqported by trying the command:

bzr qconfig
bzr: ERROR: exceptions.NameError: global name 'errors' is not defined

Traceback (most recent call last):
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/Library/Python/2.5/site-packages/bzrlib/plugins/qbzr/__init__.py", line 275, in run
    window = QBzrConfigWindow()
  File "/Library/Python/2.5/site-packages/bzrlib/lazy_import.py", line 125, in __call__
    return obj(*args, **kwargs)
  File "/Library/Python/2.5/site-packages/bzrlib/plugins/qbzr/config.py", line 143, in __init__
    self.load()
  File "/Library/Python/2.5/site-packages/bzrlib/plugins/qbzr/config.py", line 156, in load
    except errors.NoEmailInUsername:
NameError: global name 'errors' is not defined

bzr 1.5 on python 2.5.1 (darwin)
arguments: ['/usr/local/bin/bzr', 'qconfig']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  bzrtools /Library/Python/2.5/site-packages/bzrlib/plugins/bzrtools [1.5.0]
  launchpad /Library/Python/2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  qbzr /Library/Python/2.5/site-packages/bzrlib/plugins/qbzr [0.9.0]
  rebase /Library/Python/2.5/site-packages/bzrlib/plugins/rebase [0.3.0dev0]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

The code referenced is:

    def load(self):
        """Load the configuration."""
        config = GlobalConfig()
        parser = config._get_parser()

        # Name & e-mail
        username = config.username()
        if username:
            self.nameEdit.setText(extract_name(username, strict=True))
            try:
                self.emailEdit.setText(extract_email_address(username))
            except errors.NoEmailInUsername:
                pass