--- a/src/modules/client/image.py	Wed Oct 01 17:13:30 2008 -0700
+++ b/src/modules/client/image.py	Thu Oct 02 18:36:05 2008 -0700
@@ -837,7 +837,8 @@
                                         try:
                                                 retrieve.touch_manifest(self,
                                                     fmri)
-                                        except NameError:
+                                        except (retrieve.ManifestRetrievalError,
+                                            retrieve.DatastreamRetrievalError):
                                                 pass
 
                                         # Manifests should only be marked as
@@ -930,7 +931,8 @@
                         # to the manifest, attempt to download a new one.
                         if not m or not self._valid_manifest(fmri, m):
                                 m = self.__fetch_manifest_with_retries(fmri)
-                except NameError:
+                except (retrieve.ManifestRetrievalError,
+                    retrieve.DatastreamRetrievalError):
                         # In this case, the client has failed to download a new
                         # manifest or re-download an existing one with the same
                         # name.