From f0ef9ea561d9db589e2558f9e8065b75f9edc064 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sun, 8 Apr 2018 20:27:10 +0200
Subject: [PATCH] Better error handling during scan

---
 api/funkwhale_api/federation/library.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/funkwhale_api/federation/library.py b/api/funkwhale_api/federation/library.py
index f9a1de8f7..6fa3c7183 100644
--- a/api/funkwhale_api/federation/library.py
+++ b/api/funkwhale_api/federation/library.py
@@ -96,5 +96,10 @@ def get_library_data(library_url):
     serializer = serializers.PaginatedCollectionSerializer(
         data=response.json(),
     )
-    serializer.is_valid(raise_exception=True)
+    if not serializer.is_valid():
+        return {
+            'errors': [
+                'Invalid ActivityPub response from remote library']
+        }
+
     return serializer.validated_data