diff --git a/libraries/APM_BinComm/APM_BinComm.cpp b/libraries/APM_BinComm/APM_BinComm.cpp
index 109271a605..088bc9a672 100644
--- a/libraries/APM_BinComm/APM_BinComm.cpp
+++ b/libraries/APM_BinComm/APM_BinComm.cpp
@@ -98,6 +98,13 @@ BinComm::update(void)
         // XXX we might want to further constrain this count
         count = _interface->available();
 
+		if (count >= 128)
+		{
+			char text[50];
+			strncpy(text,"buffer overflow",50);
+			send_msg_status_text(1,text);
+		}
+
         while (count--)
                 _decode(_interface->read());
 }