diff --git a/filesystem.go b/filesystem.go
index 6035a068..43cf8c82 100644
--- a/filesystem.go
+++ b/filesystem.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -70,18 +69,18 @@ func CopyTree(sourcetree, desttree string) error {
 		case 0:
 			err := CopyFile(p, target, info.Mode())
 			if err != nil {
-				log.Panicf("Failed to copy file %s: %v", p, err)
+				return fmt.Errorf("Failed to copy file %s: %w", p, err)
 			}
 		case os.ModeDir:
 			os.Mkdir(target, info.Mode())
 		case os.ModeSymlink:
 			link, err := os.Readlink(p)
 			if err != nil {
-				log.Panicf("Failed to read symlink %s: %v", suffix, err)
+				return fmt.Errorf("Failed to read symlink %s: %w", suffix, err)
 			}
 			os.Symlink(link, target)
 		default:
-			log.Panicf("Not handled /%s %v", suffix, info.Mode())
+			return fmt.Errorf("File %s with mode %v not handled", p, info.Mode())
 		}
 
 		return nil