From 80838045751152ad1ec398896009531492d5c917 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Tue, 13 Dec 2016 16:02:14 +0000
Subject: [PATCH] Make sure wrapped retry/fatal errors are never nil to avoid
 panic

---
 fs/error.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fs/error.go b/fs/error.go
index 5b91f9a25..dc826501a 100644
--- a/fs/error.go
+++ b/fs/error.go
@@ -58,6 +58,9 @@ var _ Retrier = wrappedRetryError{(error)(nil)}
 
 // RetryError makes an error which indicates it would like to be retried
 func RetryError(err error) error {
+	if err == nil {
+		err = errors.New("needs retry")
+	}
 	return wrappedRetryError{err}
 }
 
@@ -100,6 +103,9 @@ var _ Fataler = wrappedFatalError{(error)(nil)}
 // FatalError makes an error which indicates it is a fatal error and
 // the sync should stop.
 func FatalError(err error) error {
+	if err == nil {
+		err = errors.New("fatal error")
+	}
 	return wrappedFatalError{err}
 }