diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c
index 74b2ef111d6..736168e2e2f 100644
--- a/extern/hipew/src/hipew.c
+++ b/extern/hipew/src/hipew.c
@@ -233,7 +233,7 @@ static int hipewHipInit(void) {
   /* Library paths. */
 #ifdef _WIN32
   /* Expected in C:/Windows/System32 or similar, no path needed. */
-  const char *hip_paths[] = {"amdhip64.dll", NULL};
+  const char *hip_paths[] = {"amdhip64.dll", "amdhip64_6.dll", NULL};
 
 #elif defined(__APPLE__)
   /* Default installation path. */
diff --git a/intern/cycles/device/hiprt/device_impl.cpp b/intern/cycles/device/hiprt/device_impl.cpp
index db603cd725e..f3ef48089f0 100644
--- a/intern/cycles/device/hiprt/device_impl.cpp
+++ b/intern/cycles/device/hiprt/device_impl.cpp
@@ -803,6 +803,12 @@ hiprtScene HIPRTDevice::build_tlas(BVHHIPRT *bvh,
                                    hiprtBuildOptions options,
                                    bool refit)
 {
+
+  size_t num_object = objects.size();
+  if (num_object == 0) {
+    return 0;
+  }
+
   hiprtBuildOperation build_operation = refit ? hiprtBuildOperationUpdate :
                                                 hiprtBuildOperationBuild;
 
@@ -816,7 +822,6 @@ hiprtScene HIPRTDevice::build_tlas(BVHHIPRT *bvh,
   size_t num_instances = 0;
   int blender_instance_id = 0;
 
-  size_t num_object = objects.size();
   user_instance_id.alloc(num_object);
   prim_visibility.alloc(num_object);
   hiprt_blas_ptr.alloc(num_object);