diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc
index cea6211a87..68e4a96721 100755
--- a/hipamd/bin/hipcc
+++ b/hipamd/bin/hipcc
@@ -498,6 +498,10 @@ foreach $arg (@ARGV)
             $obj = "$tmpdir/$obj";
             my $fileType = `file $obj`;
             my $isObj = ($fileType =~ m/ELF/ or $fileType =~ m/COFF/);
+            if ($fileType =~ m/ELF/) {
+                my $sections = `readelf -e -W $obj`;
+                $isObj = !($sections =~ m/__CLANG_OFFLOAD_BUNDLE__/);
+            }
             $allIsObj = ($allIsObj and $isObj);
             if ($isObj) {
                 $realObjs = ($realObjs . " " . $obj);
diff --git a/hipamd/src/hip_clang.cpp b/hipamd/src/hip_clang.cpp
index cfd75df562..44080884e7 100644
--- a/hipamd/src/hip_clang.cpp
+++ b/hipamd/src/hip_clang.cpp
@@ -165,11 +165,13 @@ extern "C" void __hipRegisterFunction(
   assert(modules && modules->size() >= g_deviceCnt);
   for (int deviceId = 0; deviceId < g_deviceCnt; ++deviceId) {
     hipFunction_t function;
-    if (hipSuccess == hipModuleGetFunction(&function, modules->at(deviceId), deviceName)) {
+    if (hipSuccess == hipModuleGetFunction(&function, modules->at(deviceId), deviceName) &&
+        function != nullptr) {
       functions[deviceId] = function;
     }
     else {
-      tprintf(DB_FB, "missing kernel %s for device %d\n", deviceName, deviceId);
+      tprintf(DB_FB, "__hipRegisterFunction cannot find kernel %s for"
+          " device %d\n", deviceName, deviceId);
     }
   }
 
@@ -249,9 +251,11 @@ hipError_t hipLaunchByPtr(const void *hostFunction)
 
   hipError_t e = hipSuccess;
   decltype(g_functions)::iterator it;
-  if ((it = g_functions.find(hostFunction)) == g_functions.end()) {
+  if ((it = g_functions.find(hostFunction)) == g_functions.end() ||
+      !it->second[deviceId]) {
     e = hipErrorUnknown;
-    fprintf(stderr, "kernel %p not found!\n", hostFunction);
+    fprintf(stderr, "hipLaunchByPtr cannot find kernel with stub address %p"
+        " for device %d!\n", hostFunction, deviceId);
     abort();
   } else {
     size_t size = exec._arguments.size();