diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py
index d249893d8..2dac5c89f 100644
--- a/beetsplug/chroma.py
+++ b/beetsplug/chroma.py
@@ -200,7 +200,10 @@ def submit_items(userkey, items, chunksize=64):
     def submit_chunk():
         """Submit the current accumulated fingerprint data."""
         log.info('submitting {0} fingerprints'.format(len(data)))
-        acoustid.submit(API_KEY, userkey, data)
+        try:
+            acoustid.submit(API_KEY, userkey, data)
+        except acoustid.AcoustidError as exc:
+            log.warn(u'acoustid submission error: {}'.format(exc))
         del data[:]
 
     for item in items:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a5cc21cee..8572722d8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -55,6 +55,8 @@ Other stuff:
   MusicBrainz exceptions occur.
 * :doc:`/plugins/echonest_tempo`: Catch socket errors that are not handled by
   the Echo Nest library.
+* :doc:`/plugins/chroma`: Catch Acoustid Web service errors when submitting
+  fingerprints.
 
 1.1b2 (February 16, 2013)
 -------------------------