diff --git a/main.go b/main.go
index 4989370..24f16bd 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -89,7 +90,7 @@ func changePassword(args *argContainer) {
 			exitcodes.Exit(err)
 		}
 		if len(masterkey) == 0 {
-			panic("empty masterkey")
+			log.Panic("empty masterkey")
 		}
 		tlog.Info.Println("Please enter your new password.")
 		newPw := readpassword.Twice(args.extpass)
diff --git a/test.bash b/test.bash
index 5f0c7e4..d306b7e 100755
--- a/test.bash
+++ b/test.bash
@@ -64,7 +64,7 @@ else
 	rm -Rf $TESTDIR
 fi
 
-if grep -R "panic(" internal ; then
+if grep -R "panic(" *.go internal ; then
 	echo "Please use log.Panic instead of naked panic!"
 	exit 1
 fi