diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb
index 0027ff77..7e0dd3c8 100644
--- a/app/controllers/admin/conference_controller.rb
+++ b/app/controllers/admin/conference_controller.rb
@@ -24,9 +24,12 @@ class Admin::ConferenceController < ApplicationController
 
   def update
     @conference = Conference.find_by(short_title: params[:id])
-    @conference.update_attributes(params[:conference])
-    flash[:notice] = "Updated Conference"
-    redirect_to(admin_conference_path(:id => @conference.short_title), :notice => 'Conference was successfully updated.')
+    short_title = @conference.short_title
+    if @conference.update_attributes(params[:conference])
+      redirect_to(admin_conference_path(id: @conference.short_title), notice: 'Conference was successfully updated.')
+    else
+      redirect_to(admin_conference_path(id: short_title), notice: 'Conference update failed.')
+    end
   end
 
   def show