diff --git a/src/diagnostics_relay.c b/src/diagnostics_relay.c
index b6cf4d9..5444fcc 100644
--- a/src/diagnostics_relay.c
+++ b/src/diagnostics_relay.c
@@ -299,6 +299,9 @@
 	ret = diagnostics_relay_send(client, dict);
 	plist_free(dict);
 	dict = NULL;
+	if (ret != DIAGNOSTICS_RELAY_E_SUCCESS) {
+		return ret;
+	}
 
 	ret = diagnostics_relay_receive(client, &dict);
 	if (!dict) {
@@ -341,6 +344,9 @@
 	ret = diagnostics_relay_send(client, dict);
 	plist_free(dict);
 	dict = NULL;
+	if (ret != DIAGNOSTICS_RELAY_E_SUCCESS) {
+		return ret;
+	}
 
 	ret = diagnostics_relay_receive(client, &dict);
 	if (!dict) {
@@ -386,6 +392,9 @@
 	ret = diagnostics_relay_send(client, dict);
 	plist_free(dict);
 	dict = NULL;
+	if (ret != DIAGNOSTICS_RELAY_E_SUCCESS) {
+		return ret;
+	}
 
 	ret = diagnostics_relay_receive(client, &dict);
 	if (!dict) {