1 files changed, 5 insertions, 1 deletions
diff --git a/fbin/fbin.py b/fbin/fbin.py
index 35fd1fc..cf7de02 100755
--- a/fbin/fbin.py
+++ b/fbin/fbin.py
@@ -25,6 +25,7 @@ from werkzeug.utils import secure_filename
 from . import db
 from .monkey import patch as monkey_patch
 from .login import login_manager, load_user
+from .file_storage.exceptions import StorageError
 
 storage = importlib.import_module(current_app.config.get('STORAGE_MODULE', '.file_storage.filesystem'), package='fbin').Storage(current_app)
 
@@ -136,7 +137,10 @@ def upload(api=False, user=None):
     if not uploaded_file or not uploaded_file.filename:
         return error('No valid file or filename was provided.')
     file_hash = ''.join(random.choice(base62_alphabet) for x in range(5))
-    new_file = storage.store_file(uploaded_file, file_hash, user, request.remote_addr)
+    try:
+        new_file = storage.store_file(uploaded_file, file_hash, user, request.remote_addr)
+    except StorageError as e:
+        return error(str(e))
 
     mime = new_file.get_mime_type()
     # TODO: Apparently TIFF also supports EXIF, test this.