Change the error message.
Add multimethod and clean up.