API change, deal with certain error cases in a more visable way