6fc159f17c
Correctly corralling record classes, and providing correct messages to the user. Reviewed-by: rfield, vromero