diff --git a/cmd/root.go b/cmd/root.go
index 79c91229..3e681137 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -20,6 +20,14 @@ import (
 )
 
 func Execute() error {
+	// properly log unhandled panics
+	defer func() {
+		panicVal := recover()
+		if panicVal != nil {
+			log.Panic().Msgf("%v", panicVal)
+		}
+	}()
+
 	return root.Execute()
 }