diff --git a/CMakeModules/CreateGitVersionHeader.cmake b/CMakeModules/CreateGitVersionHeader.cmake
index 0c10fb61ec..51b69eda56 100644
--- a/CMakeModules/CreateGitVersionHeader.cmake
+++ b/CMakeModules/CreateGitVersionHeader.cmake
@@ -58,7 +58,18 @@ macro( create_git_version_header _git_src_path )
     # to KiCadVersion.cmake as the revision level.
     if( _git_DESCRIBE )
         set( KICAD_VERSION "(${_git_DESCRIBE})" )
+    endif()
+
+    if( _git_REV_COUNT )
         set( KICAD_GIT_REV "${_git_REV_COUNT}" )
+
+        # Sanity check
+        if (NOT KICAD_GIT_REV MATCHES "^[0-9]+$")
+            set( KICAD_GIT_REV "0" )
+        endif ()
+    else()
+        # Incase the command failed, we can just default to 0, only a problem in CI right now
+        set( KICAD_GIT_REV "0" )
     endif()
 
 endmacro()