diff --git a/tasks/main.yml b/tasks/main.yml
index b2a5d23..9ce9465 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: "Check gitea version"
-  shell: "/usr/local/bin/gitea -v | cut -d' ' -f 3"
+  shell: "set -eo pipefail; /usr/local/bin/gitea -v | cut -d' ' -f 3"
   register: gitea_active_version
   changed_when: false
   failed_when: false
@@ -15,7 +15,7 @@
     mode: 0755
     force: true
   notify: "Restart gitea"
-  when: (gitea_version_check == false) or (gitea_active_version.stdout != gitea_version)
+  when: (not gitea_version_check) or (gitea_active_version.stdout != gitea_version)
 
 - include: create_user.yml