Added :error_message option