diff --git a/README.md b/README.md
index ae89e57d2..f85a4b1e4 100644
--- a/README.md
+++ b/README.md
@@ -190,6 +190,7 @@ Telegraf currently has support for collecting metrics from:
 * rabbitmq
 * redis
 * rethinkdb
+* zfs
 * zookeeper
 * system
     * cpu
diff --git a/plugins/zfs/zfs.go b/plugins/zfs/zfs.go
index baafdaaef..559c80b95 100644
--- a/plugins/zfs/zfs.go
+++ b/plugins/zfs/zfs.go
@@ -62,7 +62,7 @@ func (z *Zfs) Gather(acc plugins.Accumulator) error {
 	for _, metric := range kstatMetrics {
 		lines, err := common.ReadLines(kstatPath + "/" + metric)
 		if err != nil {
-			panic(err)
+			return err
 		}
 		for i, line := range lines {
 			if i == 0 || i == 1 {