Make check more specific; change message for missing