2 files changed, 22 insertions, 8 deletions
diff --git a/test/suite/cases/adapter.c b/test/suite/cases/adapter.c
index 4fcf6b9ad..c8e7c0388 100644
--- a/test/suite/cases/adapter.c
+++ b/test/suite/cases/adapter.c
@@ -52,9 +52,14 @@ bool adapter_set_name() {
   TASSERT(error == BT_STATUS_SUCCESS, "Error setting device name.");
   TASSERT(adapter_get_property_count() == 1, "Expected 1 adapter property change, found %d instead.", adapter_get_property_count());
   TASSERT(adapter_get_property(BT_PROPERTY_BDNAME), "The Bluetooth name property did not change.");
-  TASSERT(property_equals(adapter_get_property(BT_PROPERTY_BDNAME), name), "Bluetooth name '%s' does not match test value", property_as_name(adapter_get_property(BT_PROPERTY_BDNAME))->name);
-
-  property_free(name);
+  const bt_bdname_t *name_prop = property_as_name(adapter_get_property(BT_PROPERTY_BDNAME));
+  if (name_prop) {
+      TASSERT(property_equals(adapter_get_property(BT_PROPERTY_BDNAME), name), "Bluetooth name '%s' does not match test value", name_prop->name);
+  } else {
+      TASSERT(name_prop != NULL, "Extracting Bluetooth Name property failed.");
+  }
+  if(name)
+      property_free(name);
 
   return true;
 }
@@ -68,9 +73,14 @@ bool adapter_get_name() {
   TASSERT(error == BT_STATUS_SUCCESS, "Error getting device name.");
   TASSERT(adapter_get_property_count() == 1, "Expected 1 adapter property change, found %d instead.", adapter_get_property_count());
   TASSERT(adapter_get_property(BT_PROPERTY_BDNAME), "The Bluetooth name property did not change.");
-  TASSERT(property_equals(adapter_get_property(BT_PROPERTY_BDNAME), name), "Bluetooth name '%s' does not match test value", property_as_name(adapter_get_property(BT_PROPERTY_BDNAME))->name);
-
-  property_free(name);
+  const bt_bdname_t *name_prop = property_as_name(adapter_get_property(BT_PROPERTY_BDNAME));
+  if (name_prop) {
+      TASSERT(property_equals(adapter_get_property(BT_PROPERTY_BDNAME), name), "Bluetooth name '%s' does not match test value", name_prop->name);
+  } else {
+      TASSERT(name_prop != NULL, "Extracting Bluetooth Name property failed.");
+  }
+  if(name)
+      property_free(name);
   return true;
 }
 
diff --git a/test/suite/support/hal.c b/test/suite/support/hal.c
index 3ebcf743c..b22ca6226 100644
--- a/test/suite/support/hal.c
+++ b/test/suite/support/hal.c
@@ -100,9 +100,13 @@ static bool set_wake_alarm(uint64_t delay_millis, bool should_wake, alarm_cb cb,
   new_value.it_value.tv_nsec = (delay_millis % 1000) * 1000 * 1000;
   new_value.it_interval.tv_sec = 0;
   new_value.it_interval.tv_nsec = 0;
-  timer_settime(*timer, 0, &new_value, NULL);
+  if(!timer){
+      return false;
+  } else {
+       timer_settime(*timer, 0, &new_value, NULL);
+       return true;
+  }
 
-  return true;
 }
 
 static int acquire_wake_lock(const char *lock_name) {