use more specific exception for service error, added missing imports, removed old mock data code