diff --git a/src/apps/serialconnect/SerialApp.cpp b/src/apps/serialconnect/SerialApp.cpp
index 73ca7836ed..0afb356a41 100644
--- a/src/apps/serialconnect/SerialApp.cpp
+++ b/src/apps/serialconnect/SerialApp.cpp
@@ -84,7 +84,9 @@ void SerialApp::MessageReceived(BMessage* message)
 			const char* bytes;
 			ssize_t size;
 
-			message->FindData("data", B_RAW_TYPE, (const void**)&bytes, &size);
+			if (message->FindData("data", B_RAW_TYPE, (const void**)&bytes,
+					&size) != B_OK)
+				break;
 
 			if (bytes[0] == '\n') {
 				size = 2;
@@ -113,6 +115,7 @@ void SerialApp::MessageReceived(BMessage* message)
 			} else {
 				debugger("Invalid BMessage received");
 			}
+			break;
 		}
 		case kMsgSettings:
 		{
diff --git a/src/apps/serialconnect/SerialWindow.cpp b/src/apps/serialconnect/SerialWindow.cpp
index aa60936fe0..277eefb8c8 100644
--- a/src/apps/serialconnect/SerialWindow.cpp
+++ b/src/apps/serialconnect/SerialWindow.cpp
@@ -249,8 +249,9 @@ void SerialWindow::MessageReceived(BMessage* message)
 		{
 			const char* bytes;
 			ssize_t length;
-			message->FindData("data", B_RAW_TYPE, (const void**)&bytes, &length);
-			fTermView->PushBytes(bytes, length);
+			if (message->FindData("data", B_RAW_TYPE, (const void**)&bytes,
+					&length) == B_OK)
+				fTermView->PushBytes(bytes, length);
 			break;
 		}
 		case kMsgLogfile:
diff --git a/src/apps/serialconnect/TermView.cpp b/src/apps/serialconnect/TermView.cpp
index 4979a791ce..8adbdd3c6e 100644
--- a/src/apps/serialconnect/TermView.cpp
+++ b/src/apps/serialconnect/TermView.cpp
@@ -86,9 +86,11 @@ void TermView::Draw(BRect updateRect)
 			foreground.red = cell.fg.red;
 			foreground.green = cell.fg.green;
 			foreground.blue = cell.fg.blue;
+			foreground.alpha = 255;
 			background.red = cell.bg.red;
 			background.green = cell.bg.green;
 			background.blue = cell.bg.blue;
+			background.alpha = 255;
 
 			if(cell.attrs.reverse) {
 				SetLowColor(foreground);