diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 6b805f8b49..1140e5be7d 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -500,8 +500,6 @@ class ContentLibrariesTest(ContentLibrariesRestApiTest):
             lib_id = lib["id"]
             block_data = self._add_block_to_library(lib_id, "unit", "unit1")
             # Second block should throw error
-            with self.assertRaises(BlockLimitReachedError):
-                self._add_block_to_library(lib_id, "problem", "problem1")
+            self._add_block_to_library(lib_id, "problem", "problem1", expect_response=400)
             # Also check that limit applies to child blocks too
-            with self.assertRaises(BlockLimitReachedError):
-                self._add_block_to_library(lib_id, "html", "html1", parent_block=block_data["id"])
+            self._add_block_to_library(lib_id, "html", "html1", parent_block=block_data['id'], expect_response=400)
diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py
index 99a692c461..f3536fa747 100644
--- a/openedx/core/djangoapps/content_libraries/views.py
+++ b/openedx/core/djangoapps/content_libraries/views.py
@@ -60,6 +60,9 @@ def convert_exceptions(fn):
         except api.InvalidNameError as exc:
             log.exception(str(exc))
             raise ValidationError(str(exc))
+        except api.BlockLimitReachedError as exc:
+            log.exception(str(exc))
+            raise ValidationError(str(exc))
     return wrapped_fn