diff --git a/server.cpp b/server.cpp
index 118e4352..826e42d3 100644
--- a/server.cpp
+++ b/server.cpp
@@ -33,9 +33,9 @@ int main () {
     timeval tvChunk;
     gettimeofday(&tvChunk, NULL);
 	long nextTick = getTickCount();
-    while (!cin.bad())
+    while (cin.good())
     {
-		for (size_t n=0; (n<WIRE_CHUNK_SIZE) && !cin.bad(); ++n)
+		for (size_t n=0; (n<WIRE_CHUNK_SIZE) && cin.good(); ++n)
 		{
 			c[0] = cin.get();
 			c[1] = cin.get();