2 files changed, 9 insertions, 9 deletions
diff --git a/railties/lib/rails/command/actions.rb b/railties/lib/rails/command/actions.rb
index 31b656ec31..8fda1c87c6 100644
--- a/railties/lib/rails/command/actions.rb
+++ b/railties/lib/rails/command/actions.rb
@@ -8,11 +8,16 @@ module Rails
         Dir.chdir(File.expand_path("../../", APP_PATH)) unless File.exist?(File.expand_path("config.ru"))
       end
 
-      if defined?(ENGINE_PATH)
-        def require_application_and_environment!
-          require ENGINE_PATH
+      def require_application_and_environment!
+        require ENGINE_PATH if defined?(ENGINE_PATH)
+
+        if defined?(APP_PATH)
+          require APP_PATH
+          Rails.application.require_environment!
         end
+      end
 
+      if defined?(ENGINE_PATH)
         def load_tasks
           Rake.application.init("rails")
           Rake.application.load_rakefile
@@ -24,11 +29,6 @@ module Rails
           engine.load_generators
         end
       else
-        def require_application_and_environment!
-          require APP_PATH
-          Rails.application.require_environment!
-        end
-
         def load_tasks
           Rails.application.load_tasks
         end
diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb
index 7ae190433a..1435792536 100644
--- a/railties/lib/rails/command/base.rb
+++ b/railties/lib/rails/command/base.rb
@@ -56,7 +56,7 @@ module Rails
         end
 
         def perform(command, args, config) # :nodoc:
-          command = nil if Thor::HELP_MAPPINGS.include?(args.first)
+          command = nil if Rails::Command::HELP_MAPPINGS.include?(args.first)
 
           dispatch(command, args.dup, nil, config)
         end