Add a simple check to set the comment if stopped another way