WIP: APIs changed, add some error handling codes