@@ -1785,13 +1785,18 @@ def run_configure(config_file, args):

                         else:

                             raise Exception("Encryption verification error.")

-                except Exception, e:

+                except S3Error, e:

                     error(u"Test failed: %s" % (e))

-                    if e.find('403') != -1:

+                    if e.code == "AccessDenied":

                         error(u"Are you sure your keys have ListAllMyBuckets permissions?")

                     val = raw_input("\nRetry configuration? [Y/n] ")

                     if val.lower().startswith("y") or val == "":

                         continue

+                except Exception, e:

+                    error(u"Test failed: %s" % (e))

+                    val = raw_input("\nRetry configuration? [Y/n] ")

+                    if val.lower().startswith("y") or val == "":

+                        continue

             val = raw_input("\nSave settings? [y/N] ")