diff --git a/cdba-server.c b/cdba-server.c
index c463f19..992730e 100644
--- a/cdba-server.c
+++ b/cdba-server.c
@@ -59,10 +59,10 @@ static void msg_select_board(const void *param)
 	if (!selected_device) {
 		fprintf(stderr, "failed to open %s\n", (const char *)param);
 		watch_quit();
+	} else {
+		device_fastboot_open(selected_device, &fastboot_ops);
 	}
 
-	device_fastboot_open(selected_device, &fastboot_ops);
-
 	cdba_send(MSG_SELECT_BOARD);
 }