diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index d1c8064..5250807 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -51,14 +51,9 @@ module ActionView

         begin
           Float(number)
-          is_number_html_safe = true
         rescue ArgumentError, TypeError
-          if options[:raise]
-            raise InvalidNumberError, number
-          else
-            is_number_html_safe = number.to_s.html_safe?
-          end
-        end
+          raise InvalidNumberError, number
+        end if options[:raise]

         number       = number.to_s.strip
         options      = options.symbolize_keys
@@ -76,7 +71,7 @@ module ActionView
           number.starts_with?('-') ? number.slice!(1..-1) : number
         end
         str << " x #{extension}" unless extension.blank?
-        is_number_html_safe ? str.html_safe : str
+        h str
       end

       # Formats a +number+ into a currency string (e.g., $13.65). You can customize the format
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index c14dfb2..dcdf28d 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -289,7 +289,8 @@ class NumberHelperTest < ActionView::TestCase
     assert number_to_percentage("asdf".html_safe).html_safe?

     assert number_to_phone(1).html_safe?
-    assert !number_to_phone("<script></script>").html_safe?
+    assert_equal "<script></script>", number_to_phone("<script></script>")
+    assert number_to_phone("<script></script>").html_safe?
     assert number_to_phone("asdf".html_safe).html_safe?

     assert number_with_delimiter(1).html_safe?