Added missing check for lookup