Fix error messages in cut and pasted code.
Also, fix an unnecessary deref to get ctrlr.
Noticed by: rpokala@ Sponsored by: Netflix