Fix a type in an error message.
Add a missing return arg.