diff --git a/headers/private/app/MessageUtils.h b/headers/private/app/MessageUtils.h
index 840bc57089..dfd5fc6854 100644
--- a/headers/private/app/MessageUtils.h
+++ b/headers/private/app/MessageUtils.h
@@ -63,7 +63,7 @@ public:
 								}
 
 								if (fError == 0)
-									throw B_ERROR;
+									fError = B_ERROR;
 								throw fError;
 							}
 
@@ -71,11 +71,9 @@ public:
 		inline void			operator()(T data, size_t len)
 							{
 								fError = fStream->Read((void *)data, len);
-								if (fError > B_OK)
+								if (fError >= B_OK)
 									return;
 
-								if (fError == 0)
-									throw B_ERROR;
 								throw fError;
 							}