Add contacts and better errors