diff --git a/apps/documents/models.py b/apps/documents/models.py
index 75341f1582..47d85032d8 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -87,17 +87,16 @@ class Document(models.Model):
                     if exc.errno == errno.EEXIST:
                         pass
                     else: 
-                        raise 'Unable to create metadata indexing directory.'
+                        return _(u'Unable to create metadata indexing directory.')
 
                 target_filepath = os.path.join(target_directory, os.extsep.join([slugify(self.file_filename), slugify(self.file_extension)]))
-                    
                 try:
                     os.symlink(os.path.abspath(self.file.path), target_filepath)
                 except OSError as exc:
                     if exc.errno == errno.EEXIST:
                         pass
                     else: 
-                        raise 'Unable to create metadata indexing directory.'
+                        return _(u'Unable to create metadata indexing symbolic link.')
 
 
 available_functions_string = (_(u' Available functions: %s') % ','.join(['%s()' % name for name, function in AVAILABLE_FUNCTIONS.items()])) if AVAILABLE_FUNCTIONS else ''
diff --git a/apps/documents/views.py b/apps/documents/views.py
index eef4577c0f..ef7c7bf060 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -61,7 +61,10 @@ def upload_document_with_type(request, document_type_id, multiple=True):
                 document_metadata.save()
 
             messages.success(request, _(u'Document uploaded successfully.'))
-            instance.create_fs_links()
+            error_msg = instance.create_fs_links()
+            if error_msg:
+                messages.error(request, error_msg)
+                
             if multiple:
                 return HttpResponseRedirect(request.get_full_path())
             else: