diff --git a/hardware/arduino/cores/arduino/CDC.cpp b/hardware/arduino/cores/arduino/CDC.cpp
index b229cb5c5..0d04b9c7d 100644
--- a/hardware/arduino/cores/arduino/CDC.cpp
+++ b/hardware/arduino/cores/arduino/CDC.cpp
@@ -166,9 +166,15 @@ size_t Serial_::write(uint8_t c)
 	// open connection isn't broken cleanly (cable is yanked out, host dies
 	// or locks up, or host virtual serial port hangs)
 	if (_usbLineInfo.lineState > 0)	{
-		USB_Send(CDC_TX,&c,1);
-		return 1;
+		int r = USB_Send(CDC_TX,&c,1);
+		if (r > 0) {
+			return r;
+		} else {
+			setWriteError();
+			return 0;
+		}
 	}
+	setWriteError();
 	return 0;
 }
 
diff --git a/hardware/arduino/cores/arduino/HID.cpp b/hardware/arduino/cores/arduino/HID.cpp
index cea90fc44..e3aadb584 100644
--- a/hardware/arduino/cores/arduino/HID.cpp
+++ b/hardware/arduino/cores/arduino/HID.cpp
@@ -398,11 +398,15 @@ size_t Keyboard_::write(uint8_t c)
 			_keyMap->charToKey(c,&keys);
 		else
 		{
-			if (c >= 128)
+			if (c >= 128) {
+				setWriteError();
 				return 0;
+			}
 			c = pgm_read_byte(_asciimap + c);
-			if (!c)
+			if (!c) {
+				setWriteError();
 				return 0;
+			}
 			if (c & 0x80)
 			{
 				keys.modifiers |= KEY_MODIFIER_LEFT_SHIFT;