@@ -846,6 +846,7 @@ def cmd_sync_remote2local(args):

     empty_fname_re = re.compile(r'\A\s*\Z')

     def _set_local_filename(remote_list, destination_base):

+        keys_to_remove = []

         if len(remote_list) == 0:

             return

         if not os.path.isdir(destination_base):

@@ -857,15 +858,17 @@ def cmd_sync_remote2local(args):

             if destination_base[-1] != os.path.sep:

                 destination_base += os.path.sep

             for key in remote_list:

-                local_basename = key

                 if empty_fname_re.match(key):

                     # Objects may exist on S3 with empty names (''), which don't map so well to common filesystems.

-                    local_basename = '__AWS-EMPTY-OBJECT-NAME__'

-                    warning(u"Empty object name on S3 found, saving locally as %s" % (local_basename))

-                local_filename = destination_base + local_basename

+                    warning(u"Empty object name on S3 found, ignoring.")

+                    keys_to_remove.append(key)

+                    continue

+                local_filename = destination_base + key

                 if os.path.sep != "/":

                     local_filename = os.path.sep.join(local_filename.split("/"))

                 remote_list[key]['local_filename'] = deunicodise(local_filename)

+            for key in keys_to_remove:

+                del remote_list[key]

     _set_local_filename(remote_list, destination_base)

     _set_local_filename(update_list, destination_base)