WIP wrong lookup API called, added error handling