diff --git a/host/hackrf-tools/src/hackrf_cpldjtag.c b/host/hackrf-tools/src/hackrf_cpldjtag.c
index fc82deb4..bdd7c051 100644
--- a/host/hackrf-tools/src/hackrf_cpldjtag.c
+++ b/host/hackrf-tools/src/hackrf_cpldjtag.c
@@ -120,13 +120,6 @@ int main(int argc, char** argv)
 			usage();
 			return EXIT_FAILURE;
 		}
-
-		if (result != HACKRF_SUCCESS) {
-			fprintf(stderr, "argument error: %s (%d)\n",
-					hackrf_error_name(result), result);
-			usage();
-			return EXIT_FAILURE;
-		}
 	}
 
 	if (path == NULL) {
diff --git a/host/hackrf-tools/src/hackrf_max2837.c b/host/hackrf-tools/src/hackrf_max2837.c
index f52ca9e1..f64761b3 100644
--- a/host/hackrf-tools/src/hackrf_max2837.c
+++ b/host/hackrf-tools/src/hackrf_max2837.c
@@ -199,13 +199,28 @@ int main(int argc, char** argv) {
 
 	if(write) {
 		result = write_register(device, register_number, register_value);
-	}
+		if(result) {
+			printf("dump_registers() failed: %s (%d)\n",
+					hackrf_error_name(result), result);
+			return EXIT_FAILURE;
+		}
+	}	
 
 	if(read) {
 		if(register_number == REGISTER_INVALID) {
 			result = dump_registers(device);
-		} else {
-			result = dump_register(device, register_number);
+			if(result) {
+				printf("dump_registers() failed: %s (%d)\n",
+						hackrf_error_name(result), result);
+				return EXIT_FAILURE;
+			}
+		}
+	} else {
+		result = dump_register(device, register_number);
+		if(result) {
+			printf("dump_registers() failed: %s (%d)\n",
+					hackrf_error_name(result), result);
+			return EXIT_FAILURE;
 		}
 	}
 
diff --git a/host/hackrf-tools/src/hackrf_operacake.c b/host/hackrf-tools/src/hackrf_operacake.c
index 0b8405b6..3a77c8ab 100644
--- a/host/hackrf-tools/src/hackrf_operacake.c
+++ b/host/hackrf-tools/src/hackrf_operacake.c
@@ -112,11 +112,6 @@ int main(int argc, char** argv) {
 			usage();
 			return EXIT_FAILURE;
 		}
-		
-		if( result != HACKRF_SUCCESS ) {
-			printf("argument error: %s (%d)\n", hackrf_error_name(result), result);
-			break;
-		}
 	}
 
 	if(!(list || set_ports)) {
diff --git a/host/hackrf-tools/src/hackrf_rffc5071.c b/host/hackrf-tools/src/hackrf_rffc5071.c
index 867bc379..f9d478e3 100644
--- a/host/hackrf-tools/src/hackrf_rffc5071.c
+++ b/host/hackrf-tools/src/hackrf_rffc5071.c
@@ -196,13 +196,28 @@ int main(int argc, char** argv) {
 
 	if(write) {
 		result = write_register(device, register_number, register_value);
+		if(result) {
+			printf("dump_registers() failed: %s (%d)\n",
+					hackrf_error_name(result), result);
+			return EXIT_FAILURE;
+		}
 	}
 
 	if(read) {
 		if(register_number == REGISTER_INVALID) {
 			result = dump_registers(device);
+			if(result) {
+				printf("dump_registers() failed: %s (%d)\n",
+						hackrf_error_name(result), result);
+				return EXIT_FAILURE;
+			}
 		} else {
 			result = dump_register(device, register_number);
+			if(result) {
+				printf("dump_registers() failed: %s (%d)\n",
+						hackrf_error_name(result), result);
+				return EXIT_FAILURE;
+			}
 		}
 	}
 
diff --git a/host/hackrf-tools/src/hackrf_si5351c.c b/host/hackrf-tools/src/hackrf_si5351c.c
index 7c8712c4..7b01f947 100644
--- a/host/hackrf-tools/src/hackrf_si5351c.c
+++ b/host/hackrf-tools/src/hackrf_si5351c.c
@@ -292,16 +292,29 @@ int main(int argc, char** argv) {
 	}
 
 	if(write) {
-		if( result == HACKRF_SUCCESS ) {
-			result = write_register(device, register_number, register_value);
+		result = write_register(device, register_number, register_value);
+		if(result) {
+			printf("dump_registers() failed: %s (%d)\n",
+					hackrf_error_name(result), result);
+			return EXIT_FAILURE;
 		}
 	}
 
 	if(read) {
 		if( register_number == REGISTER_INVALID ) {
 			result = dump_registers(device);
+			if(result) {
+				printf("dump_registers() failed: %s (%d)\n",
+						hackrf_error_name(result), result);
+				return EXIT_FAILURE;
+			}
 		} else {
 			result = dump_register(device, register_number);
+			if(result) {
+				printf("dump_registers() failed: %s (%d)\n",
+						hackrf_error_name(result), result);
+				return EXIT_FAILURE;
+			}
 		}
 	}
 
diff --git a/host/hackrf-tools/src/hackrf_spiflash.c b/host/hackrf-tools/src/hackrf_spiflash.c
index fabdb382..aa30dfcd 100644
--- a/host/hackrf-tools/src/hackrf_spiflash.c
+++ b/host/hackrf-tools/src/hackrf_spiflash.c
@@ -226,11 +226,6 @@ int main(int argc, char** argv)
 		}
 	}
 
-	if((read || write) && (fd == NULL)) {
-		fprintf(stderr, "Failed to open file: %s\n", path);
-		return EXIT_FAILURE;
-	}
-
 	result = hackrf_init();
 	if (result != HACKRF_SUCCESS) {
 		fprintf(stderr, "hackrf_init() failed: %s (%d)\n",
diff --git a/host/libhackrf/src/hackrf.c b/host/libhackrf/src/hackrf.c
index a6925611..5bb71dc6 100644
--- a/host/libhackrf/src/hackrf.c
+++ b/host/libhackrf/src/hackrf.c
@@ -1438,12 +1438,12 @@ static void hackrf_libusb_transfer_callback(struct libusb_transfer* usb_transfer
 	if(usb_transfer->status == LIBUSB_TRANSFER_COMPLETED)
 	{
 		hackrf_transfer transfer = {
-			transfer.device = device,
-			transfer.buffer = usb_transfer->buffer,
-			transfer.buffer_length = usb_transfer->length,
-			transfer.valid_length = usb_transfer->actual_length,
-			transfer.rx_ctx = device->rx_ctx,
-			transfer.tx_ctx = device->tx_ctx
+			.device = device,
+			.buffer = usb_transfer->buffer,
+			.buffer_length = usb_transfer->length,
+			.valid_length = usb_transfer->actual_length,
+			.rx_ctx = device->rx_ctx,
+			.tx_ctx = device->tx_ctx
 		};
 
 		if( device->callback(&transfer) == 0 )