diff --git a/AUTHORS b/AUTHORS
index 100370758..1eeb33ada 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,6 +49,7 @@ Xiangyu Hu <xiangyu.hu at outlook.com>
 Xiaobing Jiang <s7v7nislands at gmail.com>
 Xiuming Chen <cc at cxm.cc>
 Zhenye Xie <xiezhenye at gmail.com>
+Ruben de Vries <ruben at rubensayshi.com>
 
 # Organizations
 
diff --git a/errors.go b/errors.go
index 857854e14..2c50f2a32 100644
--- a/errors.go
+++ b/errors.go
@@ -122,6 +122,10 @@ func (mc *mysqlConn) getWarnings() (err error) {
 			warnings = append(warnings, warning)
 
 		case io.EOF:
+			if len(warnings) == 0 {
+				return nil
+			}
+
 			return warnings
 
 		default: