Improve after code review

1 files changed, 2 insertions, 1 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index f6cccae4334..1f8c5fb3d85 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -85,13 +85,14 @@ class Deployment < ActiveRecord::Base
   end
 
   def stop_action
+    return nil unless on_stop.present?
     return nil unless manual_actions
 
     @stop_action ||= manual_actions.find_by(name: on_stop)
   end
 
   def stoppable?
-    on_stop.present? && stop_action.present?
+    stop_action.present?
   end
 
   def formatted_deployment_time