diff --git a/Source/Apps/Tune/cli.inc b/Source/Apps/Tune/cli.inc
index c8ac9b8c..9f8b2551 100644
--- a/Source/Apps/Tune/cli.inc
+++ b/Source/Apps/Tune/cli.inc
@@ -7,15 +7,20 @@ CLI_ABRT_IF_OPT_FIRST:
 	RET
 
 CLI_HAVE_HBIOS_SWITCH:
- 	LD	HL, CLIARGS		; TEST FOR --HBIOS ON COMNMAND LINE
+ 	LD	HL, CLIARGS		; TEST FOR --HBIOS ON COMMAND LINE
 	LD	DE, HBIOSOPT
 	CALL	STRINDEX
 	JR	NZ, CLI_HAVE_HBIOS_SWITCH1
-	OR	$FF			; IS NOT HBIOS
+	OR	$FF			; MATCHED --HBIOS 
 	LD	(HBIOSMD), A
-	RET
-CLI_HAVE_HBIOS_SWITCH1:
-	AND	0			; IS HBIOS
+	LD	BC,(BF_SYSGET*256)+BF_SND
+	RST	08			; CHECK WE HAVE
+	XOR	A			; AT LEAST ONE
+	CP	E			; SOUND DEVICE
+	RET	NZ
+	JP	ERRHW
+CLI_HAVE_HBIOS_SWITCH1			; NOT MATCHED --HBIOS
+	XOR	A
 	LD	(HBIOSMD), A
 	RET