diff --git a/cps/helper.py b/cps/helper.py
index 49fddc38..7ac5532d 100755
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -189,11 +189,13 @@ def update_dir_stucture(book_id):
     new_titledir = get_valid_filename(book.title, False) + " (" + str(book_id) + ")"
     
     if titledir != new_titledir:
-        os.rename(path, os.path.join(os.path.dirname(path), new_titledir))
-        path = os.path.join(os.path.dirname(path), new_titledir)
+        new_title_path = os.path.join(os.path.dirname(path), new_titledir)
+        os.rename(path, new_title_path)
+        path = new_title_path
         book.path = book.path.split("/")[0] + "/" + new_titledir
     
     if authordir != new_authordir:
-        os.renames(path, os.path.join(os.path.join(config.DB_ROOT, new_authordir), os.path.basename(path)))
+        new_author_path = os.path.join(os.path.join(config.DB_ROOT, new_authordir), os.path.basename(path))
+        os.renames(path, new_author_path)
         book.path = new_authordir + "/" + book.path.split("/")[1]
     db.session.commit()
diff --git a/cps/templates/index.html b/cps/templates/index.html
index d7b0a022..f2b43112 100755
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -39,7 +39,6 @@
 <div class="discover load-more">
   <h2>{{title}}</h2>
   <div class="row">
-
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
diff --git a/cps/web.py b/cps/web.py
index ce38c4f9..ea11bb7d 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -760,6 +760,9 @@ def upload():
         if fileextension.upper() == ".PDF":
             title = filename_root
             author = "Unknown"
+        else: 
+            flash("Upload is only available for PDF files", category="error")
+            return redirect(url_for('index'))
         
         title_dir = helper.get_valid_filename(title, False)
         author_dir = helper.get_valid_filename(author.decode('utf-8'), False)