diff --git a/avatar/views.py b/avatar/views.py
index f36be0f..e37dd39 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -101,7 +101,10 @@ def img(request, email_hash, resize_method=Image.ANTIALIAS):
 def change(request, extra_context={}, next_override=None):
     if request.method == "POST":
         dirname = os.path.join(settings.MEDIA_ROOT, 'avatars')
-        os.makedirs(dirname)
+        try:
+            os.makedirs(dirname)
+        except OSError:
+            pass # The dirs already exist.
         filename = "%s.jpg" % request.user.avatar.email_hash
         full_filename = os.path.join(dirname, filename)
         (destination, destination_path) = tempfile.mkstemp()