diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb
index bc52af9b..ea008d41 100644
--- a/app/controllers/admin/conference_controller.rb
+++ b/app/controllers/admin/conference_controller.rb
@@ -32,8 +32,9 @@ class Admin::ConferenceController < ApplicationController
       redirect_to(admin_conference_path(id: @conference.short_title),
                   notice: 'Conference was successfully updated.')
     else
+      errors = @conference.errors.full_messages.join('! ')
       redirect_to(admin_conference_path(id: short_title),
-                  notice: 'Conference update failed.')
+                  flash: { error: "Conference update failed. #{errors}"  })
     end
   end
 
diff --git a/spec/controllers/conferences_controller_spec.rb b/spec/controllers/conferences_controller_spec.rb
index 57d6ad32..2b606ab1 100644
--- a/spec/controllers/conferences_controller_spec.rb
+++ b/spec/controllers/conferences_controller_spec.rb
@@ -43,6 +43,7 @@ describe Admin::ConferenceController do
                              short_title: nil)
 
           conference.reload
+          expect(flash[:error]).to eq("Conference update failed. Short title can't be blank")
           expect(conference.title).to eq('The dog and pony show')
           expect(conference.short_title).to eq('dps14')
         end
@@ -52,6 +53,7 @@ describe Admin::ConferenceController do
               attributes_for(:conference, title: 'Example Con',
                              short_title: nil)
 
+          expect(flash[:error]).to eq("Conference update failed. Short title can't be blank")
           expect(response).to redirect_to admin_conference_path(
                                               conference.short_title)
         end