diff --git a/discord.go b/discord.go
index 18f7ffa..f5852d8 100644
--- a/discord.go
+++ b/discord.go
@@ -122,6 +122,8 @@ func New(args ...interface{}) (s *Session, err error) {
 	return
 }
 
+// AddHandler allows you to add an event handler that will be fired anytime
+// the given event is triggered.
 func (s *Session) AddHandler(handler interface{}) {
 	s.Lock()
 	defer s.Unlock()
diff --git a/restapi.go b/restapi.go
index e3cf409..2c59882 100644
--- a/restapi.go
+++ b/restapi.go
@@ -844,9 +844,15 @@ func (s *Session) ChannelFileSend(channelID, name string, r io.Reader) (st *Mess
 		return nil, err
 	}
 
-	io.Copy(writer, r)
+	_, err = io.Copy(writer, r)
+	if err != nil {
+		return
+	}
 
-	bodywriter.Close()
+	err = bodywriter.Close()
+	if err != nil {
+		return
+	}
 
 	response, err := s.request("POST", CHANNEL_MESSAGES(channelID), bodywriter.FormDataContentType(), body.Bytes())
 	if err != nil {