@@ -833,6 +833,8 @@ class S3(object):

             ConnMan.put(conn)

         except ParameterError, e:

             raise

+        except (IOError, OSError), e:

+            raise

         except Exception, e:

             if retries:

                 warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

@@ -1040,6 +1042,8 @@ class S3(object):

             debug("Response: %s" % response)

         except ParameterError, e:

             raise

+        except (IOError, OSError), e:

+            raise

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -1092,6 +1096,8 @@ class S3(object):

                 if self.config.progress_meter:

                     progress.update(delta_position = len(data))

             ConnMan.put(conn)

+        except (IOError, OSError), e:

+            raise

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -2432,6 +2432,10 @@ if __name__ == '__main__':

         sys.stderr.write("See ya!\n")

         sys.exit(1)

+    except (OSError, IOError), e:

+        error(e.strerror)

+        sys.exit(1)

+

     except MemoryError:

         msg = """

 MemoryError!  You have exceeded the amount of memory available for this process.