diff --git a/Config.cmake.in b/Config.cmake.in
index 03f299a96c..0a19915565 100644
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -7,5 +7,10 @@ foreach(_comp ${composable_kernel_FIND_COMPONENTS})
 		set(composable_kernel_FOUND False)
 		set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
 	endif()
-	include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
+	if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
+		include("${CMAKE_CURRENT_LIST_DIR}/composable_kernel${_comp}Targets.cmake")
+	else()
+		set(composable_kernel_FOUND False)
+		set(composable_kernel_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+	endif()
 endforeach()
diff --git a/library/src/jit_library/src/common.cpp b/library/src/jit_library/src/common.cpp
index accd182998..067b60df68 100644
--- a/library/src/jit_library/src/common.cpp
+++ b/library/src/jit_library/src/common.cpp
@@ -1,6 +1,7 @@
 
 #include "ck/host/common.hpp"
 #include "ck_headers.hpp"
+#include <stdexcept>
 
 namespace ck {
 namespace host {