diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40101fc3cdbbee48bf214edd27cf4f3143409528..cdc737865745bdbeb7158e9c1032cbe0c559d5d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,8 +114,6 @@ license_headers:
     - key: wolf-focal
       paths:
       - ci_deps/wolf/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -133,8 +131,6 @@ build_and_test:bionic:
     - key: visionutils-bionic
       paths:
       - ci_deps/vision_utils/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
@@ -154,8 +150,6 @@ build_and_test:focal:
     - key: visionutils-focal
       paths:
       - ci_deps/vision_utils/
-  except:
-    - master
   before_script:
     - *preliminaries_definition
     - *install_wolf_definition
diff --git a/cmake_modules/wolfvisionConfig.cmake b/cmake_modules/wolfvisionConfig.cmake
index d040619412c155de5e940ab17b17392b87f57777..935cc70e6cefd9e85a691e79b90843dfc3b6827f 100644
--- a/cmake_modules/wolfvisionConfig.cmake
+++ b/cmake_modules/wolfvisionConfig.cmake
@@ -48,7 +48,7 @@ macro(wolf_report_not_found REASON_MSG)
   # FindPackage() use the camelcase library name, not uppercase.
   if (wolfvision_FIND_QUIETLY)
     message(STATUS "Failed to find wolfvision- " ${REASON_MSG} ${ARGN})
-  else (wolfvision_FIND_REQUIRED)
+  elseif (wolfvision_FIND_REQUIRED)
     message(FATAL_ERROR "Failed to find wolfvision - " ${REASON_MSG} ${ARGN})
   else()
     # Neither QUIETLY nor REQUIRED, use SEND_ERROR which emits an error