diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb
index 47d63c9..bf63582 100644
--- a/app/views/orbit_bar/index.html.erb
+++ b/app/views/orbit_bar/index.html.erb
@@ -160,7 +160,7 @@
                   <% if params[:editmode] == "on" %>
                     <a tabindex="-1" href="<%= request.fullpath.split("?").first %>" style="color:red;"><i class="icons-bolt"></i>Edit Mode Off</a>
                   <% else %>
-                    <a tabindex="-1" href="<%= request.fullpath + "?editmode=on" %>"><i class="icons-bolt"></i>Edit Mode On</a>
+                    <a tabindex="-1" href="<%= request.fullpath + "#{(request.query_parameters.empty? ? "?" : "&")}editmode=on" %>"><i class="icons-bolt"></i>Edit Mode On</a>
                   <% end %>
                 </li>
               <% end %>
diff --git a/config/environment.rb b/config/environment.rb
index 344ddbf..e56f2b6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,10 @@ require File.expand_path('../application', __FILE__)
 Orbit::Application.initialize!
 Orbit::Application.config.secret_key_base = 'acc6ffc5a7d360c9cf2a7bdb4ddf9a897942ec6767413a5c0324a0fa8b86197a96298288a66bd46d8770d8b6edf509aad65716961c2c364ce006b475e6cfd418'
 OrbitApp.cleanup_modules
-OrbitApp.check_module_permissions
+begin
+  OrbitApp.check_module_permissions
+rescue Exception => e
+end
 
 if Site.count == 0
   site = Site.new