diff --git a/cmd/cloner/cloner.go b/cmd/cloner/cloner.go
index 1bc4dfbe1..421f0e69c 100644
--- a/cmd/cloner/cloner.go
+++ b/cmd/cloner/cloner.go
@@ -211,10 +211,8 @@ func gen(buf *bytes.Buffer, imports map[string]struct{}, typ *types.Named, thisP
 				writef("\t}")
 			}
 			writef("}")
-		case *types.Struct:
-			writef(`panic("TODO struct %s")`, fname)
 		default:
-			writef(`panic(fmt.Sprintf("TODO: %T", ft))`)
+			writef(`panic("TODO: %s (%T)")`, fname, ft)
 		}
 	}
 	writef("return dst")