1 files changed, 6 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
index 1b63d5faa0..3c44086e25 100644
--- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb
@@ -305,19 +305,17 @@ task default: :test
       end
 
       def author
-        if @author.nil?
-          git_user_name = `git config user.name`.chomp
-          @author = git_user_name.empty? ? "TODO: Write your name" : git_user_name
+        @author ||= begin
+          git_user_name = `git config user.name`.chomp rescue ''
+          git_user_name.blank? ? "TODO: Write your name" : git_user_name
         end
-        @author
       end
 
       def email
-        if @email.nil?
-          git_user_email = `git config user.email`.chomp
-          @email = git_user_email.empty? ? "TODO: Write your email address" : git_user_email
+        @email ||= begin
+          git_user_email = `git config user.email`.chomp rescue ''
+          git_user_email.blank? ? "TODO: Write your email address" : git_user_email
         end
-        @email
       end
 
       def valid_const?