diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py
index f3a57a839..8d2b276e0 100644
--- a/api/funkwhale_api/music/tasks.py
+++ b/api/funkwhale_api/music/tasks.py
@@ -236,7 +236,8 @@ def process_upload(upload):
     except UploadImportError as e:
         return fail_import(upload, e.code)
     except Exception:
-        return fail_import(upload, "unknown_error")
+        fail_import(upload, "unknown_error")
+        raise
 
     # under some situations, we want to skip the import (
     # for instance if the user already owns the files)
diff --git a/api/funkwhale_api/providers/audiofile/management/commands/import_files.py b/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
index d4917be5e..af5d2cee2 100644
--- a/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
+++ b/api/funkwhale_api/providers/audiofile/management/commands/import_files.py
@@ -130,7 +130,7 @@ class Command(BaseCommand):
         except models.Library.DoesNotExist:
             raise CommandError("Invalid library id")
 
-        if not library.actor.is_local:
+        if not library.actor.get_user():
             raise CommandError("Library {} is not a local library".format(library.uuid))
 
         if options["recursive"]: