diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 649546155..fe525a3ee 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
   def reset_current_user
     CurrentUser.user = nil
     CurrentUser.ip_addr = nil
-    CurrentUser.root_url = root_url
+    CurrentUser.root_url = root_url.sub(/\/$/, "")
   end
 
   def set_started_at_session
diff --git a/app/logical/storage_manager/match.rb b/app/logical/storage_manager/match.rb
index 0ce7e9cd3..7fe97f9be 100644
--- a/app/logical/storage_manager/match.rb
+++ b/app/logical/storage_manager/match.rb
@@ -70,8 +70,11 @@ class StorageManager::Match < StorageManager
       end
 
       if match
-        yield manager if block_given?
-        return manager unless block_given?
+        if block_given?
+          return yield(manager)
+        else
+          return manager
+        end
       end
     end
   end