diff --git a/cmake/CommonModules/TinyHelpers.cmake b/cmake/CommonModules/TinyHelpers.cmake
index 5cf1b14bb..512b58e08 100644
--- a/cmake/CommonModules/TinyHelpers.cmake
+++ b/cmake/CommonModules/TinyHelpers.cmake
@@ -204,8 +204,8 @@ ${TINY_UNPARSED_ARGUMENTS}")
     string(REGEX MATCHALL "${regex}" match "${versionFileContent}")
 
     if(NOT match)
-        message(FATAL_ERROR
-            "Could not detect project version number from ${versionHeader}")
+        message(FATAL_ERROR "Could not detect project version number \
+from ${versionHeader} in ${CMAKE_CURRENT_FUNCTION}().")
     endif()
 
     message(DEBUG "Matched version string - ${match}")
diff --git a/cmake/CommonModules/TinyToolchainRequirement.cmake b/cmake/CommonModules/TinyToolchainRequirement.cmake
index 337a86890..36ede7e1e 100644
--- a/cmake/CommonModules/TinyToolchainRequirement.cmake
+++ b/cmake/CommonModules/TinyToolchainRequirement.cmake
@@ -51,7 +51,7 @@ function, in ${CMAKE_CURRENT_FUNCTION}()")
 
     # This should never happen :/
     if(NOT qtVersion MATCHES "${regexpVersion}")
-        message(FATAL_ERROR "Parsing of the 'qmake -query QT_VERSION' failed, \
+        message(FATAL_ERROR "Parsing of the 'qmake -query QT_VERSION' failed \
 in ${CMAKE_CURRENT_FUNCTION}().")
     endif()
 
diff --git a/cmake/Modules/TinyDrivers.cmake b/cmake/Modules/TinyDrivers.cmake
index bcfad5335..2b7171e30 100644
--- a/cmake/Modules/TinyDrivers.cmake
+++ b/cmake/Modules/TinyDrivers.cmake
@@ -54,7 +54,7 @@ function(tiny_init_driver_types)
         else()
             message(FATAL_ERROR "Unsupported value '${DRIVERS_TYPE}' for \
 the DRIVERS_TYPE CMake option for ${TinyDrivers_target} library, allowed values are \
-Shared, Static, or Loadable (case-insensitive).")
+Shared, Static, or Loadable (case-insensitive), in ${CMAKE_CURRENT_FUNCTION}().")
         endif()
 
         message(VERBOSE "Building ${TinyDrivers_target} ${driversTypeLower} library")