diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dc3a16a..ead7f531 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,26 +47,33 @@ set(FSFW_DUMMY_TGT fsfw-dummy)
 project(${LIB_FSFW_NAME})
 add_library(${LIB_FSFW_NAME})
 
+set(FSFW_GIT_VER_HANDLING_OK FALSE)
 # Version handling
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
     message(STATUS "${MSG_PREFIX} Determining version information with git")
     include(FsfwHelpers)
     determine_version_with_git("--exclude" "docker_*")
-    set(FSFW_GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
-    list(GET FSFW_GIT_INFO 1 FSFW_VERSION)
-    list(GET FSFW_GIT_INFO 2 FSFW_SUBVERSION)
-    list(GET FSFW_GIT_INFO 3 FSFW_REVISION)
-    list(GET FSFW_GIT_INFO 4 FSFW_VERSION_CST_GIT_SHA1)
-    if(NOT FSFW_VERSION)
-        set(FSFW_VERSION ${FSFW_VERSION_IF_GIT_FAILS})
-    endif()
-    if(NOT FSFW_SUBVERSION)
-        set(FSFW_SUBVERSION ${FSFW_SUBVERSION_IF_GIT_FAILS})
-    endif()
-    if(NOT FSFW_REVISION)
-        set(FSFW_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
-    endif()
-else()
+    if(GIT_INFO)
+        set(FSFW_GIT_INFO ${GIT_INFO} CACHE STRING "Version information retrieved with git describe")
+        list(GET FSFW_GIT_INFO 1 FSFW_VERSION)
+        list(GET FSFW_GIT_INFO 2 FSFW_SUBVERSION)
+        list(GET FSFW_GIT_INFO 3 FSFW_REVISION)
+        list(GET FSFW_GIT_INFO 4 FSFW_VERSION_CST_GIT_SHA1)
+        if(NOT FSFW_VERSION)
+            set(FSFW_VERSION ${FSFW_VERSION_IF_GIT_FAILS})
+        endif()
+        if(NOT FSFW_SUBVERSION)
+            set(FSFW_SUBVERSION ${FSFW_SUBVERSION_IF_GIT_FAILS})
+        endif()
+        if(NOT FSFW_REVISION)
+            set(FSFW_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
+        endif()
+        set(FSFW_GIT_VER_HANDLING_OK TRUE)
+   else()
+        set(FSFW_GIT_VER_HANDLING_OK FALSE)
+   endif()
+endif()
+if(NOT FSFW_GIT_VER_HANDLING_OK)
     set(FSFW_VERSION ${FSFW_VERSION_IF_GIT_FAILS})
     set(FSFW_SUBVERSION ${FSFW_SUBVERSION_IF_GIT_FAILS})
     set(FSFW_REVISION ${FSFW_REVISION_IF_GIT_FAILS})