diff --git a/Handler/Upload.hs b/Handler/Upload.hs
index 8a5257d..53ab55d 100755
--- a/Handler/Upload.hs
+++ b/Handler/Upload.hs
@@ -189,13 +189,13 @@ getUploadR = do
       if
         I.null albums
         then do
+          setMessage "Please create an album first"
+          redirect NewAlbumR
+        else do
           (uploadWidget, enctype) <- generateFormPost (bulkUploadForm userId)
           formLayout $ do
             setTitle "Eidolon :: Upload Medium"
             $(widgetFile "bulkUpload")
-        else do
-          setMessage "Please create an album first"
-          redirect NewAlbumR
     Nothing -> do
       setMessage "You need to be logged in"
       redirect LoginR
diff --git a/config/routes b/config/routes
index 4a15a38..f36a109 100755
--- a/config/routes
+++ b/config/routes
@@ -58,7 +58,7 @@
 /admin/comment			AdminCommentR		GET
 /admin/comment/#CommentId	AdminCommentDeleteR	GET
 
-/tag/#Text TagR GET
+/tag/#Text			TagR			GET
 
 /feed/root/atom.xml		RootFeedAtomR		GET
 /feed/root/rss.xml		RootFeedRssR		GET