diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index d28a754..3c8b86f 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -8,11 +8,10 @@
     authorize @question
     @question.guidance = params["new-question-guidance"]
     @question.default_value = params["new-question-default-value"]
-    if @question.save!
+    if @question.save
       redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully created.')
     else
-      flash[:notice] = generate_error_notice(@question)
-      render "phases/admin_show"
+      redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: generate_error_notice(@question)
     end
   end
 
@@ -27,8 +26,7 @@
     if @question.update_attributes(params[:question])
       redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully updated.')
     else
-      flash[:notice] = generate_error_notice(@question)
-      render "phases/admin_show"
+      redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: generate_error_notice(@question)
     end
   end
 
diff --git a/test/functional/questions_controller_test.rb b/test/functional/questions_controller_test.rb
index e1d506b..fbcf4b1 100644
--- a/test/functional/questions_controller_test.rb
+++ b/test/functional/questions_controller_test.rb
@@ -46,7 +46,7 @@
   # POST /org/admin/templates/questions/:id/admin_create (admin_create_question_path)
   # ----------------------------------------------------------
   test "create a new question" do
-    params = {section_id: @section.id, text: 'Test Question', number: 9, question_format: @question_format}
+    params = {section_id: @section.id, text: 'Test Question', number: 9, question_format_id: @question_format.id}
     
     # Should redirect user to the root path if they are not logged in!
     post admin_create_question_path(@section), {question: params}
@@ -82,7 +82,7 @@
     # Valid save
     put admin_update_question_path(@section.questions.first), {question: params}
     assert_response :redirect
-    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: @section.questions.first.id)
     assert assigns(:phase)
     assert assigns(:section)
     assert assigns(:question)
@@ -91,7 +91,7 @@
     # Invalid save
     put admin_update_question_path(@section.questions.first), {question: {text: nil}}
     assert_response :redirect
-    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: Question.last.id)
+    assert_redirected_to admin_show_phase_url(id: @section.phase.id, edit: 'true', section_id: @section.id, question_id: @section.questions.first.id)
     assert assigns(:phase)
     assert assigns(:section)
     assert assigns(:question)