--- a/src/packagemanager.py	Wed Oct 01 17:13:30 2008 -0700
+++ b/src/packagemanager.py	Thu Oct 02 18:36:05 2008 -0700
@@ -58,6 +58,7 @@
 import pkg.client.history as history
 import pkg.client.image as image
 import pkg.client.progress as progress
+import pkg.client.retrieve as retrieve
 import pkg.misc as misc
 import pkg.portable as portable
 import pkg.gui.beadmin as beadm
@@ -1608,7 +1609,8 @@
                         # XXX proper permissions to save manifest, should we do something 
                         # XXX and popup information dialog?
                         pass
-                except NameError:
+                except (retrieve.ManifestRetrievalError,
+                    retrieve.DatastreamRetrievalError, NameError):
                         pass
                 return manifest