diff --git a/app/controllers/org_admin/phases_controller.rb b/app/controllers/org_admin/phases_controller.rb
index 1b39b6e..fc8e64b 100644
--- a/app/controllers/org_admin/phases_controller.rb
+++ b/app/controllers/org_admin/phases_controller.rb
@@ -91,7 +91,7 @@
       begin
         phase = get_new(phase)
         phase.modifiable = true
-        if phase.save!
+        if phase.save
           flash[:notice] = success_message(_('phase'), _('created'))
         else
           flash[:alert] = failed_create_error(phase, _('phase'))
@@ -113,7 +113,7 @@
       authorize phase
       begin
         phase = get_modifiable(phase)
-        if phase.update!(phase_params)
+        if phase.update(phase_params)
           flash[:notice] = success_message(_('phase'), _('updated'))
         else
           flash[:alert] = failed_update_error(phase, _('phase'))
diff --git a/app/controllers/org_admin/questions_controller.rb b/app/controllers/org_admin/questions_controller.rb
index f2d7ea3..e73220c 100644
--- a/app/controllers/org_admin/questions_controller.rb
+++ b/app/controllers/org_admin/questions_controller.rb
@@ -49,7 +49,7 @@
       begin
         question = get_new(question)
         section = question.section
-        if question.save!
+        if question.save
           flash[:notice] = success_message(_('question'), _('created'))
         else
           flash[:alert] = failed_create_error(question, _('question'))
@@ -75,7 +75,7 @@
         if attrs[:theme_ids].blank? && attrs[:number].present?
           attrs[:theme_ids] = []
         end
-        if question.update!(attrs)
+        if question.update(attrs)
           flash[:notice] = success_message(_('question'), _('updated'))
         else
           flash[:alert] = failed_update_error(question, _('question'))
diff --git a/app/controllers/org_admin/sections_controller.rb b/app/controllers/org_admin/sections_controller.rb
index 19467e0..25ae97b 100644
--- a/app/controllers/org_admin/sections_controller.rb
+++ b/app/controllers/org_admin/sections_controller.rb
@@ -78,7 +78,7 @@
       authorize section
       begin
         section = get_modifiable(section)
-        if section.update!(section_params)
+        if section.update(section_params)
           flash[:notice] = success_message(_('section'), _('saved'))
         else
           flash[:alert] = failed_update_error(section, _('section'))
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
index c5620a2..8fa19c9 100644
--- a/app/controllers/org_admin/templates_controller.rb
+++ b/app/controllers/org_admin/templates_controller.rb
@@ -123,7 +123,7 @@
       template = Template.new(template_params)
       template.org_id = current_user.org.id
       template.links = (params["template-links"].present? ? ActiveSupport::JSON.decode(params["template-links"]) : {"funder": [], "sample_plan": []})
-      if template.save!
+      if template.save
         redirect_to edit_org_admin_template_path(template), notice: success_message(template_type(template), _('created'))
       else
         flash[:alert] = failed_create_error(template, template_type(template))
@@ -139,7 +139,7 @@
       begin
         template.assign_attributes(template_params)
         template.links = ActiveSupport::JSON.decode(params["template-links"]) if params["template-links"].present?
-        if template.save!
+        if template.save
           render(status: :ok, json: { msg: success_message(template_type(template), _('saved'))})
         else
           # Note failed_update_error may return HTML tags (e.g. <br/>) and therefore the client should parse them accordingly
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b35f965..2c557b4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -73,7 +73,7 @@
       end
     end
 
-    if @user.save!
+    if @user.save
       if privileges_changed
         deliver_if(recipients: @user, key: 'users.admin_privileges') do |r|
           UserMailer.admin_privileges(r).deliver_now
@@ -118,7 +118,7 @@
     end
     if org.present?
       current_user.org = org
-      if current_user.save!
+      if current_user.save
         redirect_to request.referer, notice: _('Your organisation affiliation has been changed. You may now edit templates for %{org_name}.') % {org_name: current_user.org.name}
       else
         redirect_to request.referer, alert: _('Unable to change your organisation affiliation at this time.')