diff --git a/android/hal-gatt.c b/android/hal-gatt.c
index 51caf8d..b4512d4 100644
--- a/android/hal-gatt.c
+++ b/android/hal-gatt.c
@@ -523,6 +523,9 @@ static bt_status_t unregister_client(int client_if)
 {
 	struct hal_cmd_gatt_client_unregister cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT, HAL_OP_GATT_CLIENT_UNREGISTER,
@@ -533,6 +536,9 @@ static bt_status_t scan(int client_if, bool start)
 {
 	struct hal_cmd_gatt_client_scan cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 	cmd.start = start;
 
@@ -545,6 +551,9 @@ static bt_status_t connect(int client_if, const bt_bdaddr_t *bd_addr,
 {
 	struct hal_cmd_gatt_client_connect cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 	cmd.is_direct = is_direct;
 
@@ -559,6 +568,9 @@ static bt_status_t disconnect(int client_if, const bt_bdaddr_t *bd_addr,
 {
 	struct hal_cmd_gatt_client_disconnect cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 	cmd.conn_id = conn_id;
 
@@ -572,6 +584,9 @@ static bt_status_t listen(int client_if, bool start)
 {
 	struct hal_cmd_gatt_client_listen cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 	cmd.start = start;
 
@@ -583,6 +598,9 @@ static bt_status_t refresh(int client_if, const bt_bdaddr_t *bd_addr)
 {
 	struct hal_cmd_gatt_client_refresh cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(*bd_addr));
@@ -597,6 +615,9 @@ static bt_status_t search_service(int conn_id, bt_uuid_t *filter_uuid)
 	struct hal_cmd_gatt_client_search_service *cmd = (void *) buf;
 	size_t len = sizeof(*cmd);
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	memset(cmd, 0, sizeof(*cmd));
 
 	cmd->conn_id = conn_id;
@@ -619,6 +640,9 @@ static bt_status_t get_included_service(int conn_id, btgatt_srvc_id_t *srvc_id,
 	struct hal_cmd_gatt_client_get_included_service *cmd = (void *) buf;
 	size_t len = sizeof(*cmd);
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 
 	srvc_id_to_hal(&cmd->srvc_id[0], srvc_id);
@@ -643,6 +667,9 @@ static bt_status_t get_characteristic(int conn_id, btgatt_srvc_id_t *srvc_id,
 	struct hal_cmd_gatt_client_get_characteristic *cmd = (void *) buf;
 	size_t len = sizeof(*cmd);
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 
 	srvc_id_to_hal(&cmd->srvc_id, srvc_id);
@@ -667,6 +694,9 @@ static bt_status_t get_descriptor(int conn_id, btgatt_srvc_id_t *srvc_id,
 	struct hal_cmd_gatt_client_get_descriptor *cmd = (void *) buf;
 	size_t len = sizeof(*cmd);
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 
 	srvc_id_to_hal(&cmd->srvc_id, srvc_id);
@@ -692,6 +722,9 @@ static bt_status_t read_characteristic(int conn_id, btgatt_srvc_id_t *srvc_id,
 {
 	struct hal_cmd_gatt_client_read_characteristic cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.conn_id = conn_id;
 	cmd.auth_req = auth_req;
 
@@ -712,6 +745,9 @@ static bt_status_t write_characteristic(int conn_id, btgatt_srvc_id_t *srvc_id,
 	struct hal_cmd_gatt_client_write_characteristic *cmd = (void *) buf;
 	size_t cmd_len = sizeof(*cmd) + len;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 	cmd->write_type = write_type;
 	cmd->len = len;
@@ -734,6 +770,9 @@ static bt_status_t read_descriptor(int conn_id, btgatt_srvc_id_t *srvc_id,
 {
 	struct hal_cmd_gatt_client_read_descriptor cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.conn_id = conn_id;
 	cmd.auth_req = auth_req;
 
@@ -756,6 +795,9 @@ static bt_status_t write_descriptor(int conn_id, btgatt_srvc_id_t *srvc_id,
 	struct hal_cmd_gatt_client_write_descriptor *cmd = (void *) buf;
 	size_t cmd_len = sizeof(*cmd) + len;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 	cmd->write_type = write_type;
 	cmd->len = len;
@@ -776,6 +818,9 @@ static bt_status_t execute_write(int conn_id, int execute)
 {
 	struct hal_cmd_gatt_client_execute_write cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.conn_id = conn_id;
 	cmd.execute = execute;
 
@@ -791,6 +836,9 @@ static bt_status_t register_for_notification(int client_if,
 {
 	struct hal_cmd_gatt_client_register_for_notification cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(*bd_addr));
@@ -810,6 +858,9 @@ static bt_status_t deregister_for_notification(int client_if,
 {
 	struct hal_cmd_gatt_client_deregister_for_notification cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(*bd_addr));
@@ -826,6 +877,9 @@ static bt_status_t read_remote_rssi(int client_if, const bt_bdaddr_t *bd_addr)
 {
 	struct hal_cmd_gatt_client_read_remote_rssi cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.client_if = client_if;
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(*bd_addr));
@@ -842,6 +896,9 @@ static int get_device_type(const bt_bdaddr_t *bd_addr)
 	size_t resp_len = sizeof(dev_type);
 	bt_status_t status;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	memcpy(cmd.bdaddr, bd_addr, sizeof(*bd_addr));
 
 	status = hal_ipc_cmd(HAL_SERVICE_ID_GATT,
@@ -864,6 +921,9 @@ static bt_status_t set_adv_data(int server_if, bool set_scan_rsp,
 	struct hal_cmd_gatt_client_set_adv_data *cmd = (void *) buf;
 	size_t cmd_len = sizeof(*cmd) + manufacturer_len;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->server_if = server_if;
 	cmd->set_scan_rsp = set_scan_rsp;
 	cmd->include_name = include_name;
@@ -883,6 +943,9 @@ static bt_status_t test_command(int command, btgatt_test_params_t *params)
 {
 	struct hal_cmd_gatt_client_test_command cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.command = command;
 
 	memcpy(cmd.bda1, params->bda1, sizeof(*params->bda1));
@@ -904,6 +967,9 @@ static bt_status_t register_server(bt_uuid_t *uuid)
 {
 	struct hal_cmd_gatt_server_register cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	memcpy(cmd.uuid, uuid, sizeof(*uuid));
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT, HAL_OP_GATT_SERVER_REGISTER,
@@ -914,6 +980,9 @@ static bt_status_t unregister_server(int server_if)
 {
 	struct hal_cmd_gatt_server_unregister cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 
 	return hal_ipc_cmd(HAL_SERVICE_ID_GATT, HAL_OP_GATT_SERVER_UNREGISTER,
@@ -925,6 +994,9 @@ static bt_status_t server_connect(int server_if, const bt_bdaddr_t *bd_addr,
 {
 	struct hal_cmd_gatt_server_connect cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.is_direct = is_direct;
 
@@ -939,6 +1011,9 @@ static bt_status_t server_disconnect(int server_if, const bt_bdaddr_t *bd_addr,
 {
 	struct hal_cmd_gatt_server_disconnect cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.conn_id = conn_id;
 
@@ -953,6 +1028,9 @@ static bt_status_t add_service(int server_if, btgatt_srvc_id_t *srvc_id,
 {
 	struct hal_cmd_gatt_server_add_service cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.num_handles = num_handles;
 
@@ -967,6 +1045,9 @@ static bt_status_t add_included_service(int server_if, int service_handle,
 {
 	struct hal_cmd_gatt_server_add_inc_service cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 	cmd.included_handle = included_handle;
@@ -982,6 +1063,9 @@ static bt_status_t add_characteristic(int server_if, int service_handle,
 {
 	struct hal_cmd_gatt_server_add_characteristic cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 	cmd.properties = properties;
@@ -999,6 +1083,9 @@ static bt_status_t add_descriptor(int server_if, int service_handle,
 {
 	struct hal_cmd_gatt_server_add_descriptor cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 	cmd.permissions = permissions;
@@ -1015,6 +1102,9 @@ static bt_status_t start_service(int server_if, int service_handle,
 {
 	struct hal_cmd_gatt_server_start_service cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 	cmd.transport = transport;
@@ -1028,6 +1118,9 @@ static bt_status_t stop_service(int server_if, int service_handle)
 {
 	struct hal_cmd_gatt_server_stop_service cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 
@@ -1039,6 +1132,9 @@ static bt_status_t delete_service(int server_if, int service_handle)
 {
 	struct hal_cmd_gatt_server_delete_service cmd;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd.server_if = server_if;
 	cmd.service_handle = service_handle;
 
@@ -1055,6 +1151,9 @@ static bt_status_t send_indication(int server_if, int attribute_handle,
 	struct hal_cmd_gatt_server_send_indication *cmd = (void *) buf;
 	size_t cmd_len = sizeof(*cmd) + len;
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->server_if = server_if;
 	cmd->attribute_handle = attribute_handle;
 	cmd->conn_id = conn_id;
@@ -1075,6 +1174,9 @@ static bt_status_t send_response(int conn_id, int trans_id, int status,
 	struct hal_cmd_gatt_server_send_response *cmd = (void *) buf;
 	size_t cmd_len = sizeof(*cmd) + sizeof(*response);
 
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
 	cmd->conn_id = conn_id;
 	cmd->trans_id = trans_id;
 	cmd->status = status;