diff --git a/session.go b/session.go
index 870a9ac..55b4e28 100644
--- a/session.go
+++ b/session.go
@@ -627,12 +627,7 @@ func (s *Session) handleStreamMessage(hdr header) error {
 
 	// Check if this is a window update
 	if hdr.MsgType() == typeWindowUpdate {
-		if err := stream.incrSendWindow(hdr, flags); err != nil {
-			if sendErr := s.sendMsg(s.goAway(goAwayProtoErr), nil, nil); sendErr != nil {
-				s.logger.Printf("[WARN] yamux: failed to send go away: %v", sendErr)
-			}
-			return err
-		}
+		stream.incrSendWindow(hdr, flags)
 		return nil
 	}
 
diff --git a/stream.go b/stream.go
index b3adde9..cb3fbdb 100644
--- a/stream.go
+++ b/stream.go
@@ -228,10 +228,7 @@ func (s *Stream) sendWindowUpdate() error {
 
 	// Send the header
 	hdr := encode(typeWindowUpdate, flags, s.id, delta)
-	if err := s.session.sendMsg(hdr, nil, nil); err != nil {
-		return err
-	}
-	return nil
+	return s.session.sendMsg(hdr, nil, nil)
 }
 
 // sendClose is used to send a FIN
@@ -375,7 +372,7 @@ func (s *Stream) cleanup() {
 
 // processFlags is used to update the state of the stream
 // based on set flags, if any. Lock must be held
-func (s *Stream) processFlags(flags uint16) error {
+func (s *Stream) processFlags(flags uint16) {
 	// Close the stream without holding the state lock
 	closeStream := false
 	defer func() {
@@ -414,7 +411,6 @@ func (s *Stream) processFlags(flags uint16) error {
 		closeStream = true
 		s.notifyWaiting()
 	}
-	return nil
 }
 
 // notifyWaiting notifies all the waiting channels
@@ -424,22 +420,16 @@ func (s *Stream) notifyWaiting() {
 }
 
 // incrSendWindow updates the size of our send window
-func (s *Stream) incrSendWindow(hdr header, flags uint16) error {
-	if err := s.processFlags(flags); err != nil {
-		return err
-	}
-
+func (s *Stream) incrSendWindow(hdr header, flags uint16) {
+	s.processFlags(flags)
 	// Increase window, unblock a sender
 	atomic.AddUint32(&s.sendWindow, hdr.Length())
 	asyncNotify(s.sendNotifyCh)
-	return nil
 }
 
 // readData is used to handle a data frame
 func (s *Stream) readData(hdr header, flags uint16, conn io.Reader) error {
-	if err := s.processFlags(flags); err != nil {
-		return err
-	}
+	s.processFlags(flags)
 
 	// Check that our recv window is not exceeded
 	length := hdr.Length()