diff --git a/cps/helper.py b/cps/helper.py
index ed504436..51bf227c 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -299,12 +299,16 @@ def delete_book_file(book, calibrepath):
     # check that path is 2 elements deep, check that target path has no subfolders
     if book.path.count('/') == 1:
         path = os.path.join(calibrepath, book.path)
-        if len(next(os.walk(path))[1]):
-            web.app.logger.error(
-                "Deleting book " + str(book.id) + " failed, path has subfolders: " + book.path)
+        if os.path.isdir(path):
+            if len(next(os.walk(path))[1]):
+                web.app.logger.error(
+                    "Deleting book " + str(book.id) + " failed, path has subfolders: " + book.path)
+                return False
+            shutil.rmtree(path, ignore_errors=True)
+            return True
+        else:
+            web.app.logger.error("Deleting book " + str(book.id) + " failed, book path not valid: " + book.path)
             return False
-        shutil.rmtree(path, ignore_errors=True)
-        return True
     else:
         web.app.logger.error("Deleting book " + str(book.id) + " failed, book path value: "+ book.path)
         return False
diff --git a/cps/web.py b/cps/web.py
index 3aec6e2c..63148b51 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -3311,7 +3311,7 @@ def upload():
                 db.session.add(db.Comments(upload_comment, book_id))
 
             db.session.commit()
-
+            db.session.connection().connection.connection.create_function("title_sort", 1, db.title_sort)
 
             book = db.session.query(db.Books) \
                 .filter(db.Books.id == book_id).filter(common_filters()).first()
@@ -3331,7 +3331,7 @@ def upload():
             for author in db_book.authors:
                 author_names.append(author.name)
             if len(request.files.getlist("btn-upload")) < 2:
-                db.session.connection().connection.connection.create_function("title_sort", 1, db.title_sort)
+                # db.session.connection().connection.connection.create_function("title_sort", 1, db.title_sort)
                 cc = db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
                 if current_user.role_edit() or current_user.role_admin():
                     return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,title=_(u"edit metadata"))