diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index ad5387fdfb35f2420bd7b3f0f7b79bdb70797bb2..cd02fa737355516e12ccea76c3f8e7d50aa00056 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -71,7 +71,10 @@ int Coke_CanDispense(int User, int Item)
 	sprintf(tmp, "s%i\r\n", Item);
 	write(giCoke_SerialFD, tmp, 4);
 	
-	WaitForColon();
+	if( WaitForColon() ) {
+		fprintf(stderr, "Coke machine timed out (after initial)\n");
+		return -2;	// -EMYBAD
+	}
 
 	ret = ReadLine(sizeof(tmp)-1, tmp);
 	printf("ret = %i, tmp = '%s'\n", ret, tmp);