Just thought about something. You may want to separate these two cases and have different error messages for each. One saying you need the tenant attribute and the other saying it cannot be blank. That way the user will know exactly what they did wrong.