Add catching undefined by name